X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=117e8df1d09ef6744249a00feb2c257a9204db3c;hb=ce5be1b51a71786c90d373ffb7f92dc8245f9b12;hp=e2ce1ad11a931256342fdcd50ed1e02e9bc4c9cd;hpb=0ffefdb8bd172c258497ce0cd14d1f2ea1358f69;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e2ce1ad..117e8df 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,20 +156,23 @@ 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 -----------------------
 
 #if defined(_USE_MZ80)
-#include "../../cpu/mz80/mz80.h"
+#include "../cpu/mz80/mz80.h"
 
 #define z80_run(cycles)    mz80_run(cycles)
 #define z80_run_nr(cycles) mz80_run(cycles)
@@ -177,7 +180,7 @@ extern int SekCycleAimS68k;
 #define z80_resetCycles()  mz80GetElapsedTicks(1)
 
 #elif defined(_USE_DRZ80)
-#include "../../cpu/DrZ80/drz80.h"
+#include "../cpu/DrZ80/drz80.h"
 
 extern struct DrZ80 drZ80;
 
@@ -190,7 +193,7 @@ extern struct DrZ80 drZ80;
 #define z80_resetCycles()
 
 #elif defined(_USE_CZ80)
-#include "../../cpu/cz80/cz80.h"
+#include "../cpu/cz80/cz80.h"
 
 #define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)
 #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)
@@ -208,7 +211,11 @@ 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)
+extern int PicoAHW;
 
 // main oscillator clock which controls timing
 #define OSC_NTSC 53693100
@@ -335,10 +342,10 @@ typedef struct
 	union {						// 0a0000: 256K
 		struct {
 			unsigned char word_ram2M[0x40000];
-			unsigned char unused[0x20000];
+			unsigned char unused0[0x20000];
 		};
 		struct {
-			unsigned char unused[0x20000];
+			unsigned char unused1[0x20000];
 			unsigned char word_ram1M[2][0x20000];
 		};
 	};
@@ -362,13 +369,22 @@ typedef struct
 // 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);
@@ -416,7 +432,8 @@ PICO_INTERNAL int CheckDMA(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);
 
 // Sek.c
@@ -503,9 +520,17 @@ extern void lprintf(const char *fmt, ...);
 	if ((w) & EL_LOGMASK) \
 		lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
 }
+#elif defined(_MSC_VER)
+#define elprintf
 #else
 #define elprintf(w,f,...)
 #endif
 
+#ifdef _MSC_VER
+#define cdprintf
+#else
+#define cdprintf(x...)
+#endif
+
 #endif // PICO_INTERNAL_INCLUDED