X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=e92294385e0de492d2c7f99d263ac72fc31afd3d;hb=e5503e2f4fe1c7ccc46c493a1596fb0e416f678e;hp=694952e22fb72706b5364869c247dbbeb14822d1;hpb=4ff2d52753e46bce5622a5935f3d3750b5848f8f;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 694952e..e922943 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -1,17 +1,28 @@
-// Pico Library - Header File
+// Pico Library - Internal Header File
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006,2007 Grazvydas "notaz" Ignotas, all rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
 
+#ifndef PICO_INTERNAL_INCLUDED
+#define PICO_INTERNAL_INCLUDED
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "Pico.h"
 
+//
+#define USE_POLL_DETECT
+
+#ifndef PICO_INTERNAL
+#define PICO_INTERNAL
+#endif
+#ifndef PICO_INTERNAL_ASM
+#define PICO_INTERNAL_ASM
+#endif
 
 // to select core, define EMU_C68K, EMU_M68K or EMU_A68K in your makefile or project
 
@@ -27,12 +38,16 @@ extern struct Cyclone PicoCpu, PicoCpuS68k;
 #define SekCyclesLeftNoMCD PicoCpu.cycles // cycles left for this run
 #define SekCyclesLeft \
 	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+#define SekCyclesLeftS68k \
+	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuS68k.cycles)
 #define SekSetCyclesLeftNoMCD(c) PicoCpu.cycles=c
 #define SekSetCyclesLeft(c) { \
 	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
 }
 #define SekPc (PicoCpu.pc-PicoCpu.membase)
 #define SekPcS68k (PicoCpuS68k.pc-PicoCpuS68k.membase)
+#define SekSetStop(x) { PicoCpu.state_flags&=~1; if (x) { PicoCpu.state_flags|=1; PicoCpu.cycles=0; } }
+#define SekSetStopS68k(x) { PicoCpuS68k.state_flags&=~1; if (x) { PicoCpuS68k.state_flags|=1; PicoCpuS68k.cycles=0; } }
 #endif
 
 #ifdef EMU_A68K
@@ -60,15 +75,25 @@ extern int m68k_ICount;
 extern m68ki_cpu_core PicoM68kCPU; // MD's CPU
 extern m68ki_cpu_core PicoS68kCPU; // Mega CD's CPU
 #ifndef SekCyclesLeft
-#define SekCyclesLeftNoMCD m68k_cycles_remaining()
+#define SekCyclesLeftNoMCD PicoM68kCPU.cyc_remaining_cycles
 #define SekCyclesLeft \
 	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+#define SekCyclesLeftS68k \
+	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoS68kCPU.cyc_remaining_cycles)
 #define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)
 #define SekSetCyclesLeft(c) { \
 	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \
 }
 #define SekPc m68k_get_reg(&PicoM68kCPU, M68K_REG_PC)
 #define SekPcS68k m68k_get_reg(&PicoS68kCPU, M68K_REG_PC)
+#define SekSetStop(x) { \
+	if(x) { SET_CYCLES(0); PicoM68kCPU.stopped=STOP_LEVEL_STOP; } \
+	else PicoM68kCPU.stopped=0; \
+}
+#define SekSetStopS68k(x) { \
+	if(x) { SET_CYCLES(0); PicoS68kCPU.stopped=STOP_LEVEL_STOP; } \
+	else PicoS68kCPU.stopped=0; \
+}
 #endif
 #endif
 
@@ -91,9 +116,19 @@ extern int SekCycleCntS68k;
 extern int SekCycleAimS68k;
 
 #define SekCyclesResetS68k() {SekCycleCntS68k=SekCycleAimS68k=0;}
-
-// does not work as expected
-//extern int z80ExtraCycles; // extra z80 cycles, used when z80 is [en|dis]abled
+#define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)
+
+// debug cyclone
+#if defined(EMU_C68K) && defined(EMU_M68K)
+#undef SekSetCyclesLeftNoMCD
+#undef SekSetCyclesLeft
+#undef SekCyclesBurn
+#undef SekEndRun
+#define SekSetCyclesLeftNoMCD(c)
+#define SekSetCyclesLeft(c)
+#define SekCyclesBurn(c) c
+#define SekEndRun(c)
+#endif
 
 extern int PicoMCD;
 
@@ -119,21 +154,21 @@ struct PicoMisc
 {
   unsigned char rotate;
   unsigned char z80Run;
-  unsigned char padTHPhase[2]; // phase of gamepad TH switches
-  short scanline; // 0 to 261||311; -1 in fast mode
-  char dirtyPal; // Is the palette dirty (1 - change @ this frame, 2 - some time before)
-  unsigned char hardware; // Hardware value for country
-  unsigned char pal; // 1=PAL 0=NTSC
-  unsigned char sram_reg; // SRAM mode register. bit0: allow read? bit1: deny write? bit2: EEPROM?
-  unsigned short z80_bank68k;
+  unsigned char padTHPhase[2]; // 02 phase of gamepad TH switches
+  short scanline;              // 04 0 to 261||311; -1 in fast mode
+  char dirtyPal;               // 06 Is the palette dirty (1 - change @ this frame, 2 - some time before)
+  unsigned char hardware;      // 07 Hardware value for country
+  unsigned char pal;           // 08 1=PAL 0=NTSC
+  unsigned char sram_reg;      // SRAM mode register. bit0: allow read? bit1: deny write? bit2: EEPROM? bit4: detected? (header or by access)
+  unsigned short z80_bank68k;  // 0a
   unsigned short z80_lastaddr; // this is for Z80 faking
   unsigned char  z80_fakeval;
   unsigned char  pad0;
-  unsigned char  padDelay[2];  // gamepad phase time outs, so we count a delay
+  unsigned char  padDelay[2];  // 10 gamepad phase time outs, so we count a delay
   unsigned short sram_addr;  // EEPROM address register
   unsigned char sram_cycle;  // EEPROM SRAM cycle number
   unsigned char sram_slave;  // EEPROM slave word for X24C02 and better SRAMs
-  unsigned char prot_bytes[2]; // simple protection fakeing
+  unsigned char prot_bytes[2]; // simple protection faking
   unsigned short dma_bytes;  //
   unsigned char pad[2];
   unsigned int  frame_count; // mainly for movies
@@ -195,14 +230,17 @@ struct mcd_misc
 	unsigned short hint_vector;
 	unsigned char  busreq;
 	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04: emu state: reset_pending,
+	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;
+	char           pad1;
 	int            timer_int3;	// 10
 	unsigned int   timer_stopwatch;
-	int pad[10];
+	unsigned char  bcram_reg;	// 18: battery-backed RAM cart register
+	unsigned char  pad2;
+	unsigned short pad3;
+	int pad[9];
 };
 
 typedef struct
@@ -240,86 +278,104 @@ typedef struct
 #define Pico_mcd ((mcd_state *)Pico.rom)
 
 // Area.c
-int PicoAreaPackCpu(unsigned char *cpu, int is_sub);
-int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 
 // cd/Area.c
-int PicoCdSaveState(void *file);
-int PicoCdLoadState(void *file);
-int PicoCdLoadStateGfx(void *file);
+PICO_INTERNAL int PicoCdSaveState(void *file);
+PICO_INTERNAL int PicoCdLoadState(void *file);
 
 // Draw.c
-int PicoLine(int scan);
-void PicoFrameStart();
+PICO_INTERNAL int PicoLine(int scan);
+PICO_INTERNAL void PicoFrameStart(void);
 
 // Draw2.c
-void PicoFrameFull();
+PICO_INTERNAL void PicoFrameFull();
 
 // Memory.c
-int PicoInitPc(unsigned int pc);
-unsigned int CPU_CALL PicoRead32(unsigned int a);
-void PicoMemSetup();
-void PicoMemReset();
-//void PicoDasm(int start,int len);
-unsigned char z80_read(unsigned short a);
-unsigned short z80_read16(unsigned short a);
-void z80_write(unsigned char data, unsigned short a);
-void z80_write16(unsigned short data, unsigned short a);
+PICO_INTERNAL int PicoInitPc(unsigned int pc);
+PICO_INTERNAL_ASM unsigned int CPU_CALL PicoRead32(unsigned int a);
+PICO_INTERNAL void PicoMemSetup(void);
+PICO_INTERNAL_ASM void PicoMemReset(void);
+PICO_INTERNAL int PadRead(int i);
+PICO_INTERNAL unsigned char z80_read(unsigned short a);
+PICO_INTERNAL unsigned short z80_read16(unsigned short a);
+PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a);
+PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a);
 
 // cd/Memory.c
-void PicoMemSetupCD(void);
-void PicoMemResetCD(int r3);
-unsigned char  PicoReadCD8 (unsigned int a);
-unsigned short PicoReadCD16(unsigned int a);
-unsigned int   PicoReadCD32(unsigned int a);
-void PicoWriteCD8 (unsigned int a, unsigned char d);
-void PicoWriteCD16(unsigned int a, unsigned short d);
-void PicoWriteCD32(unsigned int a, unsigned int d);
+PICO_INTERNAL void PicoMemSetupCD(void);
+PICO_INTERNAL_ASM void PicoMemResetCD(int r3);
+PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 
 // Pico.c
 extern struct Pico Pico;
 extern struct PicoSRAM SRam;
 extern int emustatus;
-int CheckDMA(void);
+extern int z80startCycle, z80stopCycle; // in 68k cycles
+PICO_INTERNAL int CheckDMA(void);
 
 // cd/Pico.c
-int  PicoInitMCD(void);
-void PicoExitMCD(void);
-int  PicoResetMCD(int hard);
+PICO_INTERNAL int  PicoInitMCD(void);
+PICO_INTERNAL void PicoExitMCD(void);
+PICO_INTERNAL int PicoResetMCD(int hard);
+PICO_INTERNAL int PicoFrameMCD(void);
 
 // Sek.c
-int SekInit(void);
-int SekReset(void);
-int SekInterrupt(int irq);
-void SekState(unsigned char *data);
+PICO_INTERNAL int SekInit(void);
+PICO_INTERNAL int SekReset(void);
+PICO_INTERNAL int SekInterrupt(int irq);
+PICO_INTERNAL void SekState(unsigned char *data);
+PICO_INTERNAL void SekSetRealTAS(int use_real);
 
 // cd/Sek.c
-int SekInitS68k(void);
-int SekResetS68k(void);
-int SekInterruptS68k(int irq);
+PICO_INTERNAL int SekInitS68k(void);
+PICO_INTERNAL int SekResetS68k(void);
+PICO_INTERNAL int SekInterruptS68k(int irq);
 
 // sound/sound.c
 extern int PsndLen_exc_cnt;
 extern int PsndLen_exc_add;
 
 // VideoPort.c
-void PicoVideoWrite(unsigned int a,unsigned short d);
-unsigned int PicoVideoRead(unsigned int a);
+PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
+PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
 
 // Misc.c
-void SRAMWriteEEPROM(unsigned int d);
-unsigned int SRAMReadEEPROM();
-void SRAMUpdPending(unsigned int a, unsigned int d);
-void memcpy16(unsigned short *dest, unsigned short *src, int count);
-void memcpy16bswap(unsigned short *dest, void *src, int count);
-void memcpy32(int *dest, int *src, int count);
-void memset32(int *dest, int c, int count);
+PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);
+PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d);
+PICO_INTERNAL_ASM unsigned int SRAMReadEEPROM(void);
+PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);
+PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count);
+PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count
+PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);
 
 // cd/Misc.c
-void wram_2M_to_1M(unsigned char *m);
-void wram_1M_to_2M(unsigned char *m);
+PICO_INTERNAL_ASM void wram_2M_to_1M(unsigned char *m);
+PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);
+
+// cd/buffering.c
+PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba);
+
+// sound/sound.c
+PICO_INTERNAL void sound_reset(void);
+PICO_INTERNAL void sound_timers_and_dac(int raster);
+PICO_INTERNAL int  sound_render(int offset, int length);
+PICO_INTERNAL void sound_clear(void);
+// z80 functionality wrappers
+PICO_INTERNAL void z80_init(void);
+PICO_INTERNAL void z80_resetCycles(void);
+PICO_INTERNAL void z80_int(void);
+PICO_INTERNAL int  z80_run(int cycles);
+PICO_INTERNAL void z80_pack(unsigned char *data);
+PICO_INTERNAL void z80_unpack(unsigned char *data);
+PICO_INTERNAL void z80_reset(void);
+PICO_INTERNAL void z80_exit(void);
 
 
 #ifdef __cplusplus
 } // End of extern "C"
 #endif
+
+#endif // PICO_INTERNAL_INCLUDED
+