debug menu unified, more debug tools

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 664c2f2..7d4b06f 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -237,7 +237,8 @@ struct PicoVideo
   int status;                 // Status bits\r
   unsigned char pending_ints; // pending interrupts: ??VH????\r
   signed char lwrite_cnt;     // VDP write count during active display line\r
-  unsigned char pad[0x12];\r
+  unsigned short v_counter;   // V-counter\r
+  unsigned char pad[0x10];\r
 };\r
 \r
 struct PicoMisc\r
@@ -397,6 +398,8 @@ int CM_compareRun(int cyc, int is_sub);
 PICO_INTERNAL void PicoFrameStart(void);\r
 void PicoDrawSync(int to, int blank_last_line);\r
 extern int DrawScanline;\r
+#define MAX_LINE_SPRITES 29\r
+extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];\r
 \r
 // Draw2.c\r
 PICO_INTERNAL void PicoFrameFull();\r
@@ -434,9 +437,10 @@ PICO_INTERNAL unsigned int ym2612_read_local_68k(void);
 // Pico.c\r
 extern struct Pico Pico;\r
 extern struct PicoSRAM SRam;\r
+extern int PicoPadInt[2];\r
 extern int emustatus;\r
 extern void (*PicoResetHook)(void);\r
-extern void (*PicoLineHook)(int count);\r
+extern void (*PicoLineHook)(void);\r
 PICO_INTERNAL int  CheckDMA(void);\r
 PICO_INTERNAL void PicoDetectRegion(void);\r
 PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done);\r
@@ -462,6 +466,7 @@ PICO_INTERNAL void SekInit(void);
 PICO_INTERNAL int  SekReset(void);\r
 PICO_INTERNAL void SekState(int *data);\r
 PICO_INTERNAL void SekSetRealTAS(int use_real);\r
+void SekStepM68k(void);\r
 void SekInitIdleDet(void);\r
 void SekFinishIdleDet(void);\r
 \r
@@ -475,8 +480,8 @@ PICO_INTERNAL void cdda_start_play();
 extern short cdda_out_buffer[2*1152];\r
 extern int PsndLen_exc_cnt;\r
 extern int PsndLen_exc_add;\r
-extern int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles\r
-extern int timer_b_next_oflow, timer_b_step, timer_b_offset;\r
+extern int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
+extern int timer_b_next_oflow, timer_b_step;\r
 \r
 void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);\r
 void ym2612_pack_state(void);\r
@@ -497,13 +502,14 @@ void ym2612_unpack_state(void);
 \r
 #define timers_reset() \\r
   timer_a_next_oflow = timer_b_next_oflow = TIMER_NO_OFLOW; \\r
-  timer_a_step = timer_a_offset = TIMER_A_TICK_ZCYCLES * 1024; \\r
-  timer_b_step = timer_b_offset = TIMER_B_TICK_ZCYCLES * 256;\r
+  timer_a_step = TIMER_A_TICK_ZCYCLES * 1024; \\r
+  timer_b_step = TIMER_B_TICK_ZCYCLES * 256;\r
 \r
 \r
 // VideoPort.c\r
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);\r
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);\r
+PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);\r
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);\r
 \r
 // Misc.c\r