notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32 Pico mostly finished
[picodrive.git]
/
Pico
/
PicoFrameHints.c
diff --git
a/Pico/PicoFrameHints.c
b/Pico/PicoFrameHints.c
index
49dd37b
..
d1efa9a
100644
(file)
--- a/
Pico/PicoFrameHints.c
+++ b/
Pico/PicoFrameHints.c
@@
-1,5
+1,5
@@
// common code for Pico.c and cd/Pico.c
// common code for Pico.c and cd/Pico.c
-// (c) Copyright 2007, Grazvydas "notaz" Ignotas
+// (c) Copyright 2007,
2008
Grazvydas "notaz" Ignotas
#define CYCLES_M68K_LINE 488 // suitable for both PAL/NTSC
#define CYCLES_M68K_VINT_LAG 68
#define CYCLES_M68K_LINE 488 // suitable for both PAL/NTSC
#define CYCLES_M68K_VINT_LAG 68
@@
-11,14
+11,14
@@
// pad delay (for 6 button pads)
#define PAD_DELAY \
// pad delay (for 6 button pads)
#define PAD_DELAY \
- if (PicoOpt&
0x20
) { \
+ if (PicoOpt&
POPT_6BTN_PAD
) { \
if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0; \
if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \
}
#define Z80_RUN(z80_cycles) \
{ \
if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0; \
if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0; \
}
#define Z80_RUN(z80_cycles) \
{ \
- if ((PicoOpt&
4
) && Pico.m.z80Run) \
+ if ((PicoOpt&
POPT_EN_Z80
) && Pico.m.z80Run) \
{ \
int cnt; \
if (Pico.m.z80Run & 2) z80CycleAim += z80_cycles; \
{ \
int cnt; \
if (Pico.m.z80Run & 2) z80CycleAim += z80_cycles; \
@@
-42,7
+42,7
@@
#else
#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \
{ \
#else
#define CPUS_RUN(m68k_cycles,z80_cycles,s68k_cycles) \
{ \
- if ((PicoOpt
& 0x2000
) && (Pico_mcd->m.busreq&3) == 1) { \
+ if ((PicoOpt
&POPT_EN_MCD_PSYNC
) && (Pico_mcd->m.busreq&3) == 1) { \
SekRunPS(m68k_cycles, s68k_cycles); /* "better/perfect sync" */ \
} else { \
SekRunM68k(m68k_cycles); \
SekRunPS(m68k_cycles, s68k_cycles); /* "better/perfect sync" */ \
} else { \
SekRunM68k(m68k_cycles); \
@@
-60,7
+60,7
@@
static int PicoFrameHints(void)
int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip;
int hint; // Hint counter
int lines, y, lines_vis = 224, total_z80 = 0, z80CycleAim = 0, line_sample, skip;
int hint; // Hint counter
- if ((PicoOpt&
0x10) && !PicoSkipFrame) {
+ if ((PicoOpt&
POPT_ALT_RENDERER) && !PicoSkipFrame && (pv->reg[1]&0x40)) { // fast rend., display enabled
// draw a frame just after vblank in alternative render mode
// yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
PicoFrameFull();
// draw a frame just after vblank in alternative render mode
// yes, this will cause 1 frame lag, but this is inaccurate mode anyway.
PicoFrameFull();
@@
-125,21
+125,37
@@
static int PicoFrameHints(void)
}
// decide if we draw this line
}
// decide if we draw this line
+ if (!skip)
+ {
+ if (PicoOpt&POPT_ALT_RENDERER) {
+ // find the right moment for fast renderer, when display is no longer blanked
+ if ((pv->reg[1]&0x40) || y > 100) {
+ PicoFrameFull();
+#ifdef DRAW_FINISH_FUNC
+ DRAW_FINISH_FUNC();
+#endif
+ skip = 1;
+ }
+ }
+ else
+ {
#if CAN_HANDLE_240_LINES
#if CAN_HANDLE_240_LINES
-
if(!skip && ((!(pv->reg[1]&8) && y<
224) || (pv->reg[1]&8)) )
+
if (((!(pv->reg[1]&8) && y <
224) || (pv->reg[1]&8)) )
#else
#else
-
if(!skip && y<
224)
+
if (y <
224)
#endif
#endif
- PicoLine(y);
+ PicoLine(y);
+ }
+ }
- if
(PicoOpt&1
)
+ if
(PicoOpt&POPT_EN_FM
)
Psnd_timers_and_dac(y);
#ifndef PICO_CD
// get samples from sound chips
Psnd_timers_and_dac(y);
#ifndef PICO_CD
// get samples from sound chips
- if(y == 32 && PsndOut)
+ if
(y == 32 && PsndOut)
emustatus &= ~1;
emustatus &= ~1;
- else if((y == 224 || y == line_sample) && PsndOut)
+ else if
((y == 224 || y == line_sample) && PsndOut)
getSamples(y);
#endif
getSamples(y);
#endif
@@
-150,7
+166,7
@@
static int PicoFrameHints(void)
#ifdef PICO_CD
update_chips();
#else
#ifdef PICO_CD
update_chips();
#else
- if (PicoLineHook) PicoLineHook();
+ if (PicoLineHook) PicoLineHook(
1
);
#endif
}
#endif
}
@@
-193,10
+209,12
@@
static int PicoFrameHints(void)
elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
SekInterrupt(6);
}
elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
SekInterrupt(6);
}
- if (Pico.m.z80Run && (PicoOpt&4))
+ if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80)) {
+ elprintf(EL_INTS, "zint");
z80_int();
z80_int();
+ }
- if (PicoOpt&
1
)
+ if (PicoOpt&
POPT_EN_FM
)
Psnd_timers_and_dac(y);
// get samples from sound chips
Psnd_timers_and_dac(y);
// get samples from sound chips
@@
-214,7
+232,7
@@
static int PicoFrameHints(void)
#ifdef PICO_CD
update_chips();
#else
#ifdef PICO_CD
update_chips();
#else
- if (PicoLineHook) PicoLineHook();
+ if (PicoLineHook) PicoLineHook(
1
);
#endif
// PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
#endif
// PAL line count might actually be 313 according to Steve Snake, but that would complicate things.
@@
-229,7
+247,7
@@
static int PicoFrameHints(void)
check_cd_dma();
#endif
check_cd_dma();
#endif
- if
(PicoOpt&1
)
+ if
(PicoOpt&POPT_EN_FM
)
Psnd_timers_and_dac(y);
// Run scanline:
Psnd_timers_and_dac(y);
// Run scanline:
@@
-239,7
+257,7
@@
static int PicoFrameHints(void)
#ifdef PICO_CD
update_chips();
#else
#ifdef PICO_CD
update_chips();
#else
- if (PicoLineHook) PicoLineHook();
+ if (PicoLineHook) PicoLineHook(
1
);
#endif
}
#endif
}