notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: support ms ABI
[picodrive.git]
/
pico
/
pico.c
diff --git
a/pico/pico.c
b/pico/pico.c
index
2e561c6
..
f6b43cd
100644
(file)
--- a/
pico/pico.c
+++ b/
pico/pico.c
@@
-14,7
+14,6
@@
struct Pico Pico;
struct PicoMem PicoMem;
\r
PicoInterface PicoIn;
\r
\r
struct PicoMem PicoMem;
\r
PicoInterface PicoIn;
\r
\r
-void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
\r
void (*PicoResetHook)(void) = NULL;
\r
void (*PicoLineHook)(void) = NULL;
\r
\r
void (*PicoResetHook)(void) = NULL;
\r
void (*PicoLineHook)(void) = NULL;
\r
\r
@@
-253,10
+252,9
@@
PICO_INTERNAL int CheckDMA(void)
xfers_can = dma_timings[dma_op];
\r
if(xfers <= xfers_can)
\r
{
\r
xfers_can = dma_timings[dma_op];
\r
if(xfers <= xfers_can)
\r
{
\r
- if(dma_op&2) Pico.video.status&=~2; // dma no longer busy
\r
- else {
\r
+ Pico.video.status &= ~SR_DMA;
\r
+ if (!(dma_op & 2))
\r
burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..
\r
burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..
\r
- }
\r
Pico.m.dma_xfers = 0;
\r
} else {
\r
if(!(dma_op&2)) burn = 488;
\r
Pico.m.dma_xfers = 0;
\r
} else {
\r
if(!(dma_op&2)) burn = 488;
\r
@@
-345,6
+343,4
@@
void PicoGetInternal(pint_t which, pint_ret_t *r)
}
\r
}
\r
\r
}
\r
}
\r
\r
-// callback to output message from emu
\r
-void (*PicoMessage)(const char *msg)=NULL;
\r
-
\r
+// vim:ts=2:sw=2:expandtab
\r