X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=dcd321acd8351039d80e796965d8408b4ce03734;hb=f3a57b2d6c6a32dc09a6efd4fbef31eb876263b2;hp=3f50b4fb2df95893e11f20ca0ce83af2df234888;hpb=5a68108691ed5685682ce133aa0bcf6015c0afd8;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 3f50b4f..dcd321a 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -178,14 +178,7 @@ extern int dbg_irq_level;
 
 // ----------------------- Z80 CPU -----------------------
 
-#if defined(_USE_MZ80)
-#include "../cpu/mz80/mz80.h"
-
-#define z80_run(cycles)    { mz80GetElapsedTicks(1); mz80_run(cycles) }
-#define z80_run_nr(cycles) mz80_run(cycles)
-#define z80_int()          mz80int(0)
-
-#elif defined(_USE_DRZ80)
+#if defined(_USE_DRZ80)
 #include "../cpu/DrZ80/drz80.h"
 
 extern struct DrZ80 drZ80;
@@ -215,6 +208,8 @@ extern struct DrZ80 drZ80;
 
 #endif
 
+#define Z80_STATE_SIZE 0x60
+
 extern int z80stopCycle;         /* in 68k cycles */
 extern int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */
 extern int z80_cycle_aim;
@@ -305,6 +300,13 @@ struct PicoMisc
   unsigned int  frame_count;   // 1c for movies and idle det
 };
 
+struct PicoMS
+{
+  unsigned char carthw[0x10];
+  unsigned char io_ctl;
+  unsigned char pad[0x4f];
+};
+
 // some assembly stuff depend on these, do not touch!
 struct Pico
 {
@@ -314,9 +316,8 @@ struct Pico
     unsigned char  vramb[0x4000]; // VRAM in SMS mode
   };
   unsigned char zram[0x2000];  // 0x20000 Z80 ram
-  unsigned char ioports[0x10];
-  unsigned char sms_io_ctl;
-  unsigned char pad[0xef];     // unused
+  unsigned char ioports[0x10]; // XXX: fix asm and mv
+  unsigned char pad[0xf0];     // unused
   unsigned short cram[0x40];   // 0x22100
   unsigned short vsram[0x40];  // 0x22180
 
@@ -325,6 +326,7 @@ struct Pico
 
   struct PicoMisc m;
   struct PicoVideo video;
+  struct PicoMS ms;
 };
 
 // sram
@@ -437,6 +439,8 @@ typedef struct
 #define P32XV_PRI   (1<< 7)
 #define P32XV_Mx    (3<< 0) // display mode mask
 
+#define P32XV_SFT   (1<< 0)
+
 #define P32XV_VBLK  (1<<15)
 #define P32XV_HBLK  (1<<14)
 #define P32XV_PEN   (1<<13)
@@ -485,6 +489,7 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];
   unsigned int dmac_ptr;
   unsigned int pwm_irq_sample_cnt;
+  unsigned int reserved[9];
 };
 
 struct Pico32xMem
@@ -494,7 +499,10 @@ struct Pico32xMem
   unsigned short drcblk_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];
 #endif
   unsigned short dram[2][0x20000/2];    // AKA fb
-  unsigned char  m68k_rom[0x10000];     // 0x100; using M68K_BANK_SIZE
+  union {
+    unsigned char  m68k_rom[0x100];
+    unsigned char  m68k_rom_bank[0x10000]; // M68K_BANK_SIZE
+  };
   unsigned char  data_array[2][0x1000]; // cache in SH2s (can be used as RAM)
 #ifdef DRC_SH2
   unsigned short drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];
@@ -508,14 +516,8 @@ struct Pico32xMem
 };
 
 // area.c
-PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub);
-PICO_INTERNAL void 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;
@@ -524,19 +526,9 @@ typedef struct {
 extern carthw_state_chunk *carthw_chunks;
 #define CHUNK_CARTHW 64
 
-// area.c
-typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
-typedef size_t (areaeof)(void *file);
-typedef int    (areaseek)(void *file, long offset, int whence);
-typedef int    (areaclose)(void *file);
-extern arearw  *areaRead;  // external read and write function pointers for
-extern arearw  *areaWrite; // gzip save state ability
-extern areaeof *areaEof;
-extern areaseek *areaSeek;
-extern areaclose *areaClose;
-
 // cart.c
-void Byteswap(void *dst, const void *src, int len);
+extern int PicoCartResize(int newsize);
+extern void Byteswap(void *dst, const void *src, int len);
 extern void (*PicoCartMemSetup)(void);
 extern void (*PicoCartUnloadHook)(void);
 
@@ -610,6 +602,8 @@ PICO_INTERNAL void SekInit(void);
 PICO_INTERNAL int  SekReset(void);
 PICO_INTERNAL void SekState(int *data);
 PICO_INTERNAL void SekSetRealTAS(int use_real);
+PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub);
 void SekStepM68k(void);
 void SekInitIdleDet(void);
 void SekFinishIdleDet(void);
@@ -669,8 +663,8 @@ unsigned int EEPROM_read(void);
 
 // z80 functionality wrappers
 PICO_INTERNAL void z80_init(void);
-PICO_INTERNAL void z80_pack(unsigned char *data);
-PICO_INTERNAL void z80_unpack(unsigned char *data);
+PICO_INTERNAL void z80_pack(void *data);
+PICO_INTERNAL int  z80_unpack(const void *data);
 PICO_INTERNAL void z80_reset(void);
 PICO_INTERNAL void z80_exit(void);
 
@@ -690,13 +684,24 @@ PICO_INTERNAL void PsndGetSamplesMS(void);
 extern int PsndDacLine;
 
 // sms.c
+#ifndef NO_SMS
 void PicoPowerMS(void);
 void PicoResetMS(void);
 void PicoMemSetupMS(void);
+void PicoStateLoadedMS(void);
 void PicoFrameMS(void);
 void PicoFrameDrawOnlyMS(void);
+#else
+#define PicoPowerMS()
+#define PicoResetMS()
+#define PicoMemSetupMS()
+#define PicoStateLoadedMS()
+#define PicoFrameMS()
+#define PicoFrameDrawOnlyMS()
+#endif
 
 // 32x/32x.c
+#ifndef NO_32X
 extern struct Pico32x Pico32x;
 void Pico32xInit(void);
 void PicoPower32x(void);
@@ -704,7 +709,7 @@ void PicoReset32x(void);
 void Pico32xStartup(void);
 void PicoUnload32x(void);
 void PicoFrame32x(void);
-void p32x_update_irls(void);
+void p32x_update_irls(int nested_call);
 void p32x_reset_sh2s(void);
 
 // 32x/memory.c
@@ -715,20 +720,39 @@ void PicoWrite8_32x(unsigned int a, unsigned int d);
 void PicoWrite16_32x(unsigned int a, unsigned int d);
 void PicoMemSetup32x(void);
 void Pico32xSwapDRAM(int b);
+void Pico32xStateLoaded(void);
 void p32x_poll_event(int cpu_mask, int is_vdp);
 
 // 32x/draw.c
 void FinalizeLine32xRGB555(int sh, int line);
 void PicoDraw32xLayer(int offs, int lines, int mdbg);
+void PicoDraw32xLayerMdOnly(int offs, int lines);
+enum {
+  PDM32X_OFF,
+  PDM32X_32X_ONLY,
+  PDM32X_BOTH,
+};
 extern int Pico32xDrawMode;
 
 // 32x/pwm.c
 unsigned int p32x_pwm_read16(unsigned int a);
 void p32x_pwm_write16(unsigned int a, unsigned int d);
 void p32x_pwm_update(int *buf32, int length, int stereo);
-void p32x_timers_do(int new_line);
+void p32x_timers_do(int line_call);
 void p32x_timers_recalc(void);
 extern int pwm_frame_smp_cnt;
+#else
+#define Pico32xInit()
+#define PicoPower32x()
+#define PicoReset32x()
+#define PicoFrame32x()
+#define PicoUnload32x()
+#define Pico32xStateLoaded()
+#define PicoDraw32xSetFrameMode(...)
+#define FinalizeLine32xRGB555 NULL
+#define p32x_pwm_update(...)
+#define p32x_timers_recalc()
+#endif
 
 /* avoid dependency on newer glibc */
 static __inline int isspace_(int c)