X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=cbefce26f9e608eef4105ad2546b0c57ba9c887f;hb=213c16adcb630666f694646645a8ed4bc30c334b;hp=dab9fe254da99c220c89526cc02a272c0e8362db;hpb=dca310c413517d278898b967cfe610574310acd8;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index dab9fe2..cbefce2 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -38,12 +38,12 @@ extern "C" {
 extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run
 #define SekCyclesLeft \
-	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
-	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)
+	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)
 #define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c
 #define SekSetCyclesLeft(c) { \
-	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
+	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
 }
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
@@ -64,12 +64,12 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekCyclesLeftNoMCD PicoCpuFM68k.io_cycle_counter
 #define SekCyclesLeft \
-	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
-	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)
+	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)
 #define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c
 #define SekSetCyclesLeft(c) { \
-	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
+	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
 }
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
@@ -97,12 +97,12 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 #ifndef SekCyclesLeft
 #define SekCyclesLeftNoMCD PicoCpuMM68k.cyc_remaining_cycles
 #define SekCyclesLeft \
-	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
-	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)
+	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)
 #define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)
 #define SekSetCyclesLeft(c) { \
-	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \
+	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \
 }
 #define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)
 #define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)
@@ -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,7 +211,12 @@ extern struct DrZ80 drZ80;
 
 // ---------------------------------------------------------
 
-extern int PicoMCD;
+// Pico active hw
+#define PAHW_MCD  (1<<0)
+#define PAHW_32X  (1<<1)
+#define PAHW_SVP  (1<<2)
+#define PAHW_PICO (1<<3)
+extern int PicoAHW;
 
 // main oscillator clock which controls timing
 #define OSC_NTSC 53693100
@@ -241,7 +249,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
@@ -314,9 +322,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
@@ -359,16 +365,26 @@ 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);
+extern void (*PicoLoadStateHook)(void);
 
 // cd/Area.c
 PICO_INTERNAL int PicoCdSaveState(void *file);
 PICO_INTERNAL int PicoCdLoadState(void *file);
 
+typedef struct {
+	int chunk;
+	int size;
+	void *ptr;
+} carthw_state_chunk;
+extern carthw_state_chunk *carthw_chunks;
+#define CHUNK_CARTHW 64
+
 // Cart.c
-PICO_INTERNAL void PicoCartDetect(void);
+extern void (*PicoCartUnloadHook)(void);
 
 // Debug.c
 int CM_compareRun(int cyc, int is_sub);
@@ -382,6 +398,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);
@@ -404,6 +421,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;
@@ -411,14 +431,25 @@ 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);
 PICO_INTERNAL void PicoExitMCD(void);
-PICO_INTERNAL int PicoResetMCD(int hard);
+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);
@@ -431,6 +462,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;