X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=5bc463d3ea82f7be6277f862f1910d4bd8528c81;hb=d49b10c2f2c58e03a1be8b3b9e8bfc08703e0ce0;hp=117e8df1d09ef6744249a00feb2c257a9204db3c;hpb=99464b6230bbe515dffb8893f6b6b51031be9157;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 117e8df..5bc463d 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -212,9 +212,10 @@ extern struct DrZ80 drZ80;
 // ---------------------------------------------------------
 
 // Pico active hw
-#define PAHW_MCD (1<<0)
-#define PAHW_32X (1<<1)
-#define PAHW_SVP (1<<2)
+#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
@@ -248,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
@@ -321,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
@@ -366,6 +365,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);
@@ -398,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);
@@ -420,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;
@@ -436,6 +440,9 @@ PICO_INTERNAL void PicoPowerMCD(void);
 PICO_INTERNAL int PicoResetMCD(void);
 PICO_INTERNAL int PicoFrameMCD(void);
 
+// Pico/Pico.c
+PICO_INTERNAL int PicoInitPico(void);
+
 // Sek.c
 PICO_INTERNAL int SekInit(void);
 PICO_INTERNAL int SekReset(void);
@@ -448,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;