X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=c9aa1aa9101dc4041b18ed0284c83634605e76f7;hb=48dc74f20a90629b55c1ab676639c05a125ea383;hp=8525198f351bfc558ee0fb5471dd15f3b7e15eca;hpb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 8525198..c9aa1aa 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -1,7 +1,7 @@
 // Pico Library - Internal Header File
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006,2007 Grazvydas "notaz" Ignotas, all rights reserved.
+// (c) Copyright 2006-2008 Grazvydas "notaz" Ignotas, all rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -185,10 +185,7 @@ extern struct DrZ80 drZ80;
 
 #define z80_run(cycles)    ((cycles) - DrZ80Run(&drZ80, cycles))
 #define z80_run_nr(cycles) DrZ80Run(&drZ80, cycles)
-#define z80_int() { \
-  drZ80.z80irqvector = 0xFF; /* default IRQ vector RST opcode */ \
-  drZ80.Z80_IRQ = 1; \
-}
+#define z80_int()          drZ80.Z80_IRQ = 1
 
 #define z80_cyclesLeft     drZ80.cycles
 
@@ -240,7 +237,8 @@ struct PicoVideo
   int status;                 // Status bits
   unsigned char pending_ints; // pending interrupts: ??VH????
   signed char lwrite_cnt;     // VDP write count during active display line
-  unsigned char pad[0x12];
+  unsigned short v_counter;   // V-counter
+  unsigned char pad[0x10];
 };
 
 struct PicoMisc
@@ -248,7 +246,7 @@ struct PicoMisc
   unsigned char rotate;
   unsigned char z80Run;
   unsigned char padTHPhase[2]; // 02 phase of gamepad TH switches
-  short scanline;              // 04 0 to 261||311; -1 in fast mode
+  unsigned short scanline;     // 04 0 to 261||311
   char dirtyPal;               // 06 Is the palette dirty (1 - change @ this frame, 2 - some time before)
   unsigned char hardware;      // 07 Hardware value for country
   unsigned char pal;           // 08 1=PAL 0=NTSC
@@ -262,9 +260,9 @@ struct PicoMisc
   unsigned char  eeprom_cycle; // EEPROM SRAM cycle number
   unsigned char  eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs
   unsigned char prot_bytes[2]; // simple protection faking
-  unsigned short dma_xfers;
+  unsigned short dma_xfers;    // 18
   unsigned char pad[2];
-  unsigned int  frame_count; // mainly for movies
+  unsigned int  frame_count;   // 1c for movies and idle det
 };
 
 // some assembly stuff depend on these, do not touch!
@@ -374,8 +372,8 @@ typedef struct
 
 
 // Area.c
-PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub);
-PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL void PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 extern void (*PicoLoadStateHook)(void);
 
 // cd/Area.c
@@ -397,14 +395,15 @@ extern void (*PicoCartUnloadHook)(void);
 int CM_compareRun(int cyc, int is_sub);
 
 // Draw.c
-PICO_INTERNAL int PicoLine(int scan);
 PICO_INTERNAL void PicoFrameStart(void);
+void PicoDrawSync(int to, int blank_last_line);
+extern int DrawScanline;
 
 // Draw2.c
 PICO_INTERNAL void PicoFrameFull();
 
 // Memory.c
-PICO_INTERNAL int PicoInitPc(unsigned int pc);
+PICO_INTERNAL void PicoInitPc(unsigned int pc);
 PICO_INTERNAL unsigned int PicoCheckPc(unsigned int pc);
 PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);
 PICO_INTERNAL void PicoMemSetup(void);
@@ -431,6 +430,7 @@ PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 
 // Pico/Memory.c
 PICO_INTERNAL void PicoMemSetupPico(void);
+PICO_INTERNAL unsigned int ym2612_read_local_68k(void);
 
 // Pico.c
 extern struct Pico Pico;
@@ -443,14 +443,14 @@ PICO_INTERNAL void PicoDetectRegion(void);
 PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done);
 
 // cd/Pico.c
-PICO_INTERNAL int  PicoInitMCD(void);
+PICO_INTERNAL void PicoInitMCD(void);
 PICO_INTERNAL void PicoExitMCD(void);
 PICO_INTERNAL void PicoPowerMCD(void);
-PICO_INTERNAL int PicoResetMCD(void);
-PICO_INTERNAL int PicoFrameMCD(void);
+PICO_INTERNAL int  PicoResetMCD(void);
+PICO_INTERNAL void PicoFrameMCD(void);
 
 // Pico/Pico.c
-PICO_INTERNAL int PicoInitPico(void);
+PICO_INTERNAL void PicoInitPico(void);
 PICO_INTERNAL void PicoReratePico(void);
 
 // Pico/xpcm.c
@@ -459,15 +459,17 @@ PICO_INTERNAL void PicoPicoPCMReset(void);
 PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate);
 
 // Sek.c
-PICO_INTERNAL int SekInit(void);
-PICO_INTERNAL int SekReset(void);
+PICO_INTERNAL void SekInit(void);
+PICO_INTERNAL int  SekReset(void);
 PICO_INTERNAL void SekState(int *data);
 PICO_INTERNAL void SekSetRealTAS(int use_real);
+void SekInitIdleDet(void);
+void SekFinishIdleDet(void);
 
 // cd/Sek.c
-PICO_INTERNAL int SekInitS68k(void);
-PICO_INTERNAL int SekResetS68k(void);
-PICO_INTERNAL int SekInterruptS68k(int irq);
+PICO_INTERNAL void SekInitS68k(void);
+PICO_INTERNAL int  SekResetS68k(void);
+PICO_INTERNAL int  SekInterruptS68k(int irq);
 
 // sound/sound.c
 PICO_INTERNAL void cdda_start_play();
@@ -475,16 +477,35 @@ extern short cdda_out_buffer[2*1152];
 extern int PsndLen_exc_cnt;
 extern int PsndLen_exc_add;
 extern int timer_a_next_oflow, timer_a_step; // in z80 cycles
+extern int timer_b_next_oflow, timer_b_step;
+
+void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);
+void ym2612_pack_state(void);
+void ym2612_unpack_state(void);
+
+#define TIMER_NO_OFLOW 0x70000000
+// tA =   72 * (1024 - NA) / M
+#define TIMER_A_TICK_ZCYCLES  17203
+// tB = 1152 * (256 - NA) / M
+#define TIMER_B_TICK_ZCYCLES 262800 // 275251 broken, see Dai Makaimura
 
 #define timers_cycle() \
-  if (timer_a_next_oflow > 0) timer_a_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256
+  if (timer_a_next_oflow > 0 && timer_a_next_oflow < TIMER_NO_OFLOW) \
+    timer_a_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256; \
+  if (timer_b_next_oflow > 0 && timer_b_next_oflow < TIMER_NO_OFLOW) \
+    timer_b_next_oflow -= Pico.m.pal ? 70938*256 : 59659*256; \
+  ym2612_sync_timers(0, ym2612.OPN.ST.mode, ym2612.OPN.ST.mode);
 
 #define timers_reset() \
-  timer_a_next_oflow = 0x80000000
+  timer_a_next_oflow = timer_b_next_oflow = TIMER_NO_OFLOW; \
+  timer_a_step = TIMER_A_TICK_ZCYCLES * 1024; \
+  timer_b_step = TIMER_B_TICK_ZCYCLES * 256;
+
 
 // VideoPort.c
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
+PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);
 
 // Misc.c
@@ -528,7 +549,7 @@ extern int PsndDacLine;
 #define EL_HVCNT   0x00000001 /* hv counter reads */
 #define EL_SR      0x00000002 /* SR reads */
 #define EL_INTS    0x00000004 /* ints and acks */
-#define EL_YM2612R 0x00000008 /* 68k ym2612 reads */
+#define EL_YMTIMER 0x00000008 /* ym2612 timer stuff */
 #define EL_INTSW   0x00000010 /* log irq switching on/off */
 #define EL_ASVDP   0x00000020 /* VDP accesses during active scan */
 #define EL_VDPDMA  0x00000040 /* VDP DMA transfers and their timing */
@@ -541,6 +562,7 @@ extern int PsndDacLine;
 #define EL_CDPOLL  0x00002000 /* MCD: log poll detection */
 #define EL_SVP     0x00004000 /* SVP stuff */
 #define EL_PICOHW  0x00008000 /* Pico stuff */
+#define EL_IDLE    0x00010000 /* idle loop det. */
 
 #define EL_STATUS  0x40000000 /* status messages */
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */