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

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 765afaf..369bb5d 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -117,13 +117,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 +287,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
 {
@@ -359,7 +356,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
@@ -369,9 +365,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