X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=bd10f19e46b17477ff021bd79b2da89d069d452e;hb=f8ef8ff7100baa0ac0ecfcacb47aea3a9e24bc38;hp=0c3e687a506d060d89ff5fd9d5db81590ff84ae9;hpb=71de3cd9bb3cad7630df5b1d2a0e56475995b025;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 0c3e687..bd10f19 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "Pico.h"
+#include "carthw/carthw.h"
 
 //
 #define USE_POLL_DETECT
@@ -48,6 +49,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }
+#define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)
 #define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))
 
 #define SekInterrupt(i) PicoCpuCM68k.irq=i
@@ -79,6 +81,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 	PicoCpuFS68k.execinfo &= ~FM68K_HALTED; \
 	if (x) { PicoCpuFS68k.execinfo |= FM68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \
 }
+#define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)
 #define SekShouldInterrupt fm68k_would_interrupt()
 
 #define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq
@@ -111,6 +114,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 	if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \
 	else PicoCpuMS68k.stopped=0; \
 }
+#define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)
 #define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)
 
 #define SekInterrupt(irq) { \
@@ -381,6 +385,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
@@ -390,6 +395,9 @@ PICO_INTERNAL unsigned short z80_read16(unsigned short a);
 #else
 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 (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize);
 
 // cd/Memory.c
 PICO_INTERNAL void PicoMemSetupCD(void);
@@ -401,6 +409,7 @@ extern struct Pico Pico;
 extern struct PicoSRAM SRam;
 extern int emustatus;
 extern int z80startCycle, z80stopCycle; // in 68k cycles
+extern void (*PicoResetHook)(void);
 PICO_INTERNAL int CheckDMA(void);
 
 // cd/Pico.c
@@ -427,6 +436,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, unsigned short **srcp, unsigned short **limitp);
 
 // Misc.c
 PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);
@@ -478,16 +488,18 @@ PICO_INTERNAL void z80_exit(void);
 #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 (TODO) */
+#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) */
 
 #if EL_LOGMASK
+extern void lprintf(const char *fmt, ...);
 #define elprintf(w,f,...) \
 { \
 	if ((w) & EL_LOGMASK) \
-		printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
+		lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
 }
 #else
 #define elprintf(w,f,...)