X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=f356d40d6c5ee5327888686d4619f627f571399b;hb=759c9d38464a56c4ad5b68a0d9adb38c22d06861;hp=848da5dfa4773f1fbfe8ab82a4515b2e315d7933;hpb=0e4bde9b2d981c264343aa66809f2f26ce7843c8;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 848da5d..f356d40 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
@@ -356,7 +357,6 @@ struct PicoEState
   unsigned short HighPal[0x100];
 };
 
-// some assembly stuff still depends on these, do not touch!
 struct PicoMem
 {
   unsigned char ram[0x10000];  // 0x00000 scratch ram
@@ -366,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
@@ -825,9 +825,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
@@ -1073,25 +1071,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