X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=d3b1273c5e9ce127b8b3bf17ff0d4c1171d6d2cc;hb=381eea9b6f92cdc9a7223a0743f070719bbed7d8;hp=b84ec1ac109d9c1bdbcac5cac4232ca1ee8cf549;hpb=f53f286a8b48d19c65e83f90d00aa47e8e87c889;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index b84ec1a..d3b1273 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)
@@ -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)
@@ -208,7 +208,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 +339,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 +366,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);
@@ -385,6 +398,7 @@ PICO_INTERNAL int PicoInitPc(unsigned int pc);
 PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);
 PICO_INTERNAL void PicoMemSetup(void);
 PICO_INTERNAL_ASM void PicoMemReset(void);
+PICO_INTERNAL void PicoMemResetHooks(void);
 PICO_INTERNAL int PadRead(int i);
 PICO_INTERNAL unsigned char z80_read(unsigned short a);
 #ifndef _USE_CZ80
@@ -395,7 +409,8 @@ PICO_INTERNAL unsigned short z80_read16(unsigned short a);
 PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data);
 #endif
 extern unsigned int (*PicoRead16Hook)(unsigned int a, int realsize);
-extern void (*PicoWrite8Hook)(unsigned int a,unsigned int d,int realsize);
+extern void (*PicoWrite8Hook) (unsigned int a,unsigned int d,int realsize);
+extern void (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize);
 
 // cd/Memory.c
 PICO_INTERNAL void PicoMemSetupCD(void);
@@ -407,12 +422,15 @@ extern struct Pico Pico;
 extern struct PicoSRAM SRam;
 extern int emustatus;
 extern int z80startCycle, z80stopCycle; // in 68k cycles
+extern void (*PicoResetHook)(void);
+extern void (*PicoLineHook)(int count);
 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
@@ -433,6 +451,7 @@ extern int PsndLen_exc_add;
 // VideoPort.c
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
+extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);
 
 // Misc.c
 PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);
@@ -472,23 +491,24 @@ PICO_INTERNAL void z80_exit(void);
 #define EL_LOGMASK 0
 #endif
 
-#define EL_HVCNT   0x0001 /* hv counter reads */
-#define EL_SR      0x0002 /* SR reads */
-#define EL_INTS    0x0004 /* ints and acks */
-#define EL_YM2612R 0x0008 /* 68k ym2612 reads */
-#define EL_INTSW   0x0010 /* log irq switching on/off */
-#define EL_ASVDP   0x0020 /* VDP accesses during active scan */
-#define EL_VDPDMA  0x0040 /* VDP DMA transfers and their timing */
-#define EL_BUSREQ  0x0080 /* z80 busreq r/w or reset w */
-#define EL_Z80BNK  0x0100 /* z80 i/o through bank area */
-#define EL_SRAMIO  0x0200 /* sram i/o */
-#define EL_EEPROM  0x0400 /* eeprom debug */
-#define EL_UIO     0x0800 /* unmapped i/o */
-#define EL_IO      0x1000 /* all i/o */
-#define EL_CDPOLL  0x2000 /* MCD: log poll detection */
-
-#define EL_STATUS  0x4000 /* status messages */
-#define EL_ANOMALY 0x8000 /* some unexpected conditions (during emulation) */
+#define EL_HVCNT   0x00000001 /* hv counter reads */
+#define EL_SR      0x00000002 /* SR reads */
+#define EL_INTS    0x00000004 /* ints and acks */
+#define EL_YM2612R 0x00000008 /* 68k ym2612 reads */
+#define EL_INTSW   0x00000010 /* log irq switching on/off */
+#define EL_ASVDP   0x00000020 /* VDP accesses during active scan */
+#define EL_VDPDMA  0x00000040 /* VDP DMA transfers and their timing */
+#define EL_BUSREQ  0x00000080 /* z80 busreq r/w or reset w */
+#define EL_Z80BNK  0x00000100 /* z80 i/o through bank area */
+#define EL_SRAMIO  0x00000200 /* sram i/o */
+#define EL_EEPROM  0x00000400 /* eeprom debug */
+#define EL_UIO     0x00000800 /* unmapped i/o */
+#define EL_IO      0x00001000 /* all i/o */
+#define EL_CDPOLL  0x00002000 /* MCD: log poll detection */
+#define EL_SVP     0x00004000 /* SVP stuff */
+
+#define EL_STATUS  0x40000000 /* status messages */
+#define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */
 
 #if EL_LOGMASK
 extern void lprintf(const char *fmt, ...);
@@ -497,9 +517,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