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

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e2ce1ad..cd4d00e 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -169,7 +169,7 @@ extern int SekCycleAimS68k;
 // ----------------------- 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 +177,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 +190,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)
@@ -335,10 +335,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 +362,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 +425,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 +513,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