notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI adjustments, nub support
[picodrive.git]
/
Pico
/
Pico.c
diff --git
a/Pico/Pico.c
b/Pico/Pico.c
index
22bdb19
..
4d6f940
100644
(file)
--- a/
Pico/Pico.c
+++ b/
Pico/Pico.c
@@
-137,7
+137,7
@@
int PicoReset(int hard)
Pico.m.pal=pal;
\r
Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal
\r
\r
Pico.m.pal=pal;
\r
Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal
\r
\r
-
sound_r
eset(); // pal must be known here
\r
+
PsndR
eset(); // pal must be known here
\r
\r
if (PicoMCD & 1) {
\r
PicoResetMCD(hard);
\r
\r
if (PicoMCD & 1) {
\r
PicoResetMCD(hard);
\r
@@
-202,11
+202,9
@@
static __inline void SekRunM68k(int cyc)
{
\r
int cyc_do;
\r
SekCycleAim+=cyc;
\r
{
\r
int cyc_do;
\r
SekCycleAim+=cyc;
\r
- //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt);
\r
if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
\r
if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
\r
- //printf("cyc_do: %i\n", cyc_do);
\r
-#if defined(EMU_C68K) && defined(EMU_M68K)
\r
- // this means we do run-compare Cyclone vs Musashi
\r
+#if defined(EMU_CORE_DEBUG)
\r
+ // this means we do run-compare
\r
SekCycleCnt+=CM_compareRun(cyc_do);
\r
#elif defined(EMU_C68K)
\r
PicoCpuCM68k.cycles=cyc_do;
\r
SekCycleCnt+=CM_compareRun(cyc_do);
\r
#elif defined(EMU_C68K)
\r
PicoCpuCM68k.cycles=cyc_do;
\r
@@
-215,7
+213,7
@@
static __inline void SekRunM68k(int cyc)
#elif defined(EMU_M68K)
\r
SekCycleCnt+=m68k_execute(cyc_do);
\r
#elif defined(EMU_F68K)
\r
#elif defined(EMU_M68K)
\r
SekCycleCnt+=m68k_execute(cyc_do);
\r
#elif defined(EMU_F68K)
\r
- SekCycleCnt+=
m68k_emulate(cyc_do
);
\r
+ SekCycleCnt+=
fm68k_emulate(cyc_do+1
);
\r
#endif
\r
}
\r
\r
#endif
\r
}
\r
\r
@@
-223,8
+221,7
@@
static __inline void SekStep(void)
{
\r
// this is required for timing sensitive stuff to work
\r
int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;
\r
{
\r
// this is required for timing sensitive stuff to work
\r
int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;
\r
-#if defined(EMU_C68K) && defined(EMU_M68K)
\r
- // this means we do run-compare Cyclone vs Musashi
\r
+#if defined(EMU_CORE_DEBUG)
\r
SekCycleCnt+=CM_compareRun(1);
\r
#elif defined(EMU_C68K)
\r
PicoCpuCM68k.cycles=1;
\r
SekCycleCnt+=CM_compareRun(1);
\r
#elif defined(EMU_C68K)
\r
PicoCpuCM68k.cycles=1;
\r
@@
-233,7
+230,7
@@
static __inline void SekStep(void)
#elif defined(EMU_M68K)
\r
SekCycleCnt+=m68k_execute(1);
\r
#elif defined(EMU_F68K)
\r
#elif defined(EMU_M68K)
\r
SekCycleCnt+=m68k_execute(1);
\r
#elif defined(EMU_F68K)
\r
- SekCycleCnt+=m68k_emulate(1);
\r
+ SekCycleCnt+=
f
m68k_emulate(1);
\r
#endif
\r
SekCycleAim=realaim;
\r
}
\r
#endif
\r
SekCycleAim=realaim;
\r
}
\r
@@
-258,17
+255,17
@@
static __inline void getSamples(int y)
\r
if(y == 224) {
\r
if(emustatus & 2)
\r
\r
if(y == 224) {
\r
if(emustatus & 2)
\r
- curr_pos +=
sound_r
ender(curr_pos, PsndLen-PsndLen/2);
\r
- else curr_pos =
sound_r
ender(0, PsndLen);
\r
+ curr_pos +=
PsndR
ender(curr_pos, PsndLen-PsndLen/2);
\r
+ else curr_pos =
PsndR
ender(0, PsndLen);
\r
if (emustatus&1) emustatus|=2; else emustatus&=~2;
\r
if (PicoWriteSound) PicoWriteSound(curr_pos);
\r
// clear sound buffer
\r
if (emustatus&1) emustatus|=2; else emustatus&=~2;
\r
if (PicoWriteSound) PicoWriteSound(curr_pos);
\r
// clear sound buffer
\r
-
sound_c
lear();
\r
+
PsndC
lear();
\r
}
\r
else if(emustatus & 3) {
\r
emustatus|= 2;
\r
emustatus&=~1;
\r
}
\r
else if(emustatus & 3) {
\r
emustatus|= 2;
\r
emustatus&=~1;
\r
- curr_pos =
sound_r
ender(0, PsndLen/2);
\r
+ curr_pos =
PsndR
ender(0, PsndLen/2);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-296,7
+293,7
@@
static void PicoRunZ80Simple(int line_from, int line_to)
if (PicoOpt&1) {
\r
// we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers
\r
for (line = line_from; line < line_to; line++) {
\r
if (PicoOpt&1) {
\r
// we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers
\r
for (line = line_from; line < line_to; line++) {
\r
-
sou
nd_timers_and_dac(line);
\r
+
Ps
nd_timers_and_dac(line);
\r
if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);
\r
if (line == 32 && PsndOut) emustatus &= ~1;
\r
if (line >= line_from_r && line < line_to_r)
\r
if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);
\r
if (line == 32 && PsndOut) emustatus &= ~1;
\r
if (line >= line_from_r && line < line_to_r)
\r
@@
-400,10
+397,10
@@
static int PicoFrameSimple(void)
\r
// here we render sound if ym2612 is disabled
\r
if (!(PicoOpt&1) && PsndOut) {
\r
\r
// here we render sound if ym2612 is disabled
\r
if (!(PicoOpt&1) && PsndOut) {
\r
- int len =
sound_r
ender(0, PsndLen);
\r
+ int len =
PsndR
ender(0, PsndLen);
\r
if (PicoWriteSound) PicoWriteSound(len);
\r
// clear sound buffer
\r
if (PicoWriteSound) PicoWriteSound(len);
\r
// clear sound buffer
\r
-
sound_c
lear();
\r
+
PsndC
lear();
\r
}
\r
\r
// a gap between flags set and vint
\r
}
\r
\r
// a gap between flags set and vint
\r