X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=fa7979cce13a01d7e250a4f5332e3a7aabf2a9d7;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=765afaffcee547515d894ab5a391b485dbe73fa8;hpb=88fd63ad10faa746ef9d7ad7d98a72e51fe2aa86;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 765afaf..fa7979c 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "pico_port.h"
 #include "pico.h"
 #include "carthw/carthw.h"
 
@@ -80,7 +81,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 }
 #define SekIsStoppedM68k() (PicoCpuFM68k.execinfo&FM68K_HALTED)
 #define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)
-#define SekShouldInterrupt() fm68k_would_interrupt()
+#define SekShouldInterrupt() fm68k_would_interrupt(&PicoCpuFM68k)
 
 #define SekNotPolling     PicoCpuFM68k.not_polling
 #define SekNotPollingS68k PicoCpuFS68k.not_polling
@@ -117,13 +118,9 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 #define SekNotPolling     PicoCpuMM68k.not_polling
 #define SekNotPollingS68k PicoCpuMS68k.not_polling
 
-#define SekInterrupt(irq) { \
-	void *oldcontext = m68ki_cpu_p; \
-	m68k_set_context(&PicoCpuMM68k); \
-	m68k_set_irq(irq); \
-	m68k_set_context(oldcontext); \
-}
-#define SekIrqLevel (PicoCpuMM68k.int_level >> 8)
+// avoid m68k_set_irq() for delaying to work
+#define SekInterrupt(irq)  PicoCpuMM68k.int_level = (irq) << 8
+#define SekIrqLevel        (PicoCpuMM68k.int_level >> 8)
 
 #endif
 #endif // EMU_M68K
@@ -291,6 +288,7 @@ extern SH2 sh2s[2];
 #define SR_EMPT       (1 << 9)
 // not part of real SR
 #define PVS_ACTIVE    (1 << 16)
+#define PVS_VB2       (1 << 17) // ignores forced blanking
 
 struct PicoVideo
 {
@@ -329,7 +327,7 @@ struct PicoMisc
   unsigned char  eeprom_cycle; // EEPROM cycle number
   unsigned char  eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs
   unsigned char  eeprom_status;
-  unsigned char  pad2;
+  unsigned char  status;       // rapid_ym2612, multi_ym_updates
   unsigned short dma_xfers;    // 18
   unsigned char  eeprom_wb[2]; // EEPROM latch/write buffer
   unsigned int  frame_count;   // 1c for movies and idle det
@@ -354,12 +352,11 @@ struct PicoEState
   struct Pico *Pico;
   void *PicoMem_vram;
   void *PicoMem_cram;
-  int  *PicoOpt;
+  unsigned int  *PicoOpt;
   unsigned char *Draw2FB;
   unsigned short HighPal[0x100];
 };
 
-// some assembly stuff still depends on these, do not touch!
 struct PicoMem
 {
   unsigned char ram[0x10000];  // 0x00000 scratch ram
@@ -369,9 +366,9 @@ struct PicoMem
   };
   unsigned char zram[0x2000];  // 0x20000 Z80 ram
   unsigned char ioports[0x10]; // XXX: fix asm and mv
-  unsigned char pad[0xf0];     // unused
-  unsigned short cram[0x40];   // 0x22100
-  unsigned short vsram[0x40];  // 0x22180
+  unsigned short cram[0x40];   // 0x22010
+  unsigned char pad[0x70];     // 0x22050 DrawStripVSRam reads 0 from here
+  unsigned short vsram[0x40];  // 0x22100
 };
 
 // sram
@@ -708,8 +705,6 @@ void pcd_state_loaded_mem(void);
 // pico.c
 extern struct Pico Pico;
 extern struct PicoMem PicoMem;
-extern int PicoPadInt[2];
-extern int emustatus;
 extern void (*PicoResetHook)(void);
 extern void (*PicoLineHook)(void);
 PICO_INTERNAL int  CheckDMA(void);
@@ -828,9 +823,7 @@ unsigned char PicoVideoRead8HV_L(void);
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask);
 
 // misc.c
-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(void *dest, const void *src, int count); // 32bit word count
 PICO_INTERNAL_ASM void memset32(void *dest, int c, int count);
 
 // eeprom.c
@@ -1076,25 +1069,6 @@ void pevt_dump(void);
 #define pevt_dump()
 #endif
 
-// misc
-#ifdef _MSC_VER
-#define cdprintf
-#else
-#define cdprintf(x...)
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-#define REGPARM(x) __attribute__((regparm(x)))
-#else
-#define REGPARM(x)
-#endif
-
-#ifdef __GNUC__
-#define NOINLINE __attribute__((noinline))
-#else
-#define NOINLINE
-#endif
-
 #ifdef __cplusplus
 } // End of extern "C"
 #endif