X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=d348598d68225eed1f3eba4a849ab64b1c74d30c;hb=7a87643e0702bf156527e066c2a963b6db2b4fa5;hp=d3b1273c5e9ce127b8b3bf17ff0d4c1171d6d2cc;hpb=602133e1c66666f9152b1edb3014e137a9768cad;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index d3b1273..d348598 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -156,14 +156,17 @@ extern int SekCycleAimS68k;
 #define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)
 
 #ifdef EMU_CORE_DEBUG
+extern int dbg_irq_level;
 #undef SekSetCyclesLeftNoMCD
 #undef SekSetCyclesLeft
 #undef SekCyclesBurn
 #undef SekEndRun
+#undef SekInterrupt
 #define SekSetCyclesLeftNoMCD(c)
 #define SekSetCyclesLeft(c)
 #define SekCyclesBurn(c) c
 #define SekEndRun(c)
+#define SekInterrupt(irq) dbg_irq_level=irq
 #endif
 
 // ----------------------- Z80 CPU -----------------------
@@ -208,12 +211,6 @@ extern struct DrZ80 drZ80;
 
 // ---------------------------------------------------------
 
-// Pico active hw
-#define PAHW_MCD (1<<0)
-#define PAHW_32X (1<<1)
-#define PAHW_SVP (1<<2)
-extern int PicoAHW;
-
 // main oscillator clock which controls timing
 #define OSC_NTSC 53693100
 // seems to be accurate, see scans from http://www.hot.ee/tmeeco/
@@ -245,7 +242,7 @@ struct PicoMisc
   unsigned short z80_bank68k;  // 0a
   unsigned short z80_lastaddr; // this is for Z80 faking
   unsigned char  z80_fakeval;
-  unsigned char  pad0;
+  unsigned char  z80_reset;    // z80 reset held
   unsigned char  padDelay[2];  // 10 gamepad phase time outs, so we count a delay
   unsigned short eeprom_addr;  // EEPROM address register
   unsigned char  eeprom_cycle; // EEPROM SRAM cycle number
@@ -318,9 +315,7 @@ struct mcd_misc
 	unsigned char  s68k_pend_ints;
 	unsigned int   state_flags;	// 04: emu state: reset_pending, dmna_pending
 	unsigned int   counter75hz;
-	unsigned short audio_offset;	// 0c: for savestates: play pointer offset (0-1023)
-	unsigned char  audio_track;	// playing audio track # (zero based)
-	char           pad1;
+	unsigned int   pad0;
 	int            timer_int3;	// 10
 	unsigned int   timer_stopwatch;
 	unsigned char  bcram_reg;	// 18: battery-backed RAM cart register
@@ -363,6 +358,7 @@ typedef struct
 
 #define Pico_mcd ((mcd_state *)Pico.rom)
 
+
 // Area.c
 PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub);
 PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
@@ -395,6 +391,7 @@ PICO_INTERNAL void PicoFrameFull();
 
 // Memory.c
 PICO_INTERNAL int 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);
 PICO_INTERNAL_ASM void PicoMemReset(void);
@@ -417,6 +414,9 @@ PICO_INTERNAL void PicoMemSetupCD(void);
 PICO_INTERNAL_ASM void PicoMemResetCD(int r3);
 PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 
+// Pico/Memory.c
+PICO_INTERNAL void PicoMemSetupPico(void);
+
 // Pico.c
 extern struct Pico Pico;
 extern struct PicoSRAM SRam;
@@ -424,7 +424,8 @@ extern int emustatus;
 extern int z80startCycle, z80stopCycle; // in 68k cycles
 extern void (*PicoResetHook)(void);
 extern void (*PicoLineHook)(int count);
-PICO_INTERNAL int CheckDMA(void);
+PICO_INTERNAL int  CheckDMA(void);
+PICO_INTERNAL void PicoDetectRegion(void);
 
 // cd/Pico.c
 PICO_INTERNAL int  PicoInitMCD(void);
@@ -433,6 +434,15 @@ PICO_INTERNAL void PicoPowerMCD(void);
 PICO_INTERNAL int PicoResetMCD(void);
 PICO_INTERNAL int PicoFrameMCD(void);
 
+// Pico/Pico.c
+PICO_INTERNAL int PicoInitPico(void);
+PICO_INTERNAL void PicoReratePico(void);
+
+// Pico/xpcm.c
+PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo);
+PICO_INTERNAL void PicoPicoPCMReset(void);
+PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate);
+
 // Sek.c
 PICO_INTERNAL int SekInit(void);
 PICO_INTERNAL int SekReset(void);
@@ -445,6 +455,8 @@ PICO_INTERNAL int SekResetS68k(void);
 PICO_INTERNAL int SekInterruptS68k(int irq);
 
 // sound/sound.c
+PICO_INTERNAL void cdda_start_play();
+extern short cdda_out_buffer[2*1152];
 extern int PsndLen_exc_cnt;
 extern int PsndLen_exc_add;
 
@@ -506,6 +518,7 @@ PICO_INTERNAL void z80_exit(void);
 #define EL_IO      0x00001000 /* all i/o */
 #define EL_CDPOLL  0x00002000 /* MCD: log poll detection */
 #define EL_SVP     0x00004000 /* SVP stuff */
+#define EL_PICOHW  0x00008000 /* Pico stuff */
 
 #define EL_STATUS  0x40000000 /* status messages */
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */