foo

[mdlife] / src / hwregs.h

diff --git a/src/hwregs.h b/src/hwregs.h
index 6dd8a74..c018023 100644 (file)
--- a/src/hwregs.h
+++ b/src/hwregs.h
@@ -10,7 +10,7 @@
 #define VDP_VSRAM      0x40000010
 
 #ifndef ASM
-#include <inttypes.h>
+#include <stdint.h>
 
 #define REG16PTR(addr) (*(volatile uint16_t*)(addr))
 #define REG32PTR(addr) (*(volatile uint32_t*)(addr))
@@ -68,12 +68,14 @@
 #define VDP_M2_VINTR   0x20
 #define VDP_M2_DISP            0x40
 
-#define VDP_NA_ADDR(x) (((x) >> 14) & 0x38)
-#define VDP_NW_ADDR(x) (((x) >> 14) & 0x3e)
-#define VDP_NB_ADDR(x) ((x) >> 17)
+#define VDP_NA_ADDR(x) (((x) >> 10) & 0x38)
+#define VDP_NW_ADDR(x) (((x) >> 10) & 0x3e)
+#define VDP_NB_ADDR(x) ((x) >> 13)
 #define VDP_SPRTAB_ADDR(x)     ((x) >> 9)
 #define VDP_HSTAB_ADDR(x)      ((x) >> 10)
 
+#define VDP_ADDR_INVAL 0x10000
+
 #define VDP_BGCOL(pal, col)    (((pal) << 4) | (col))
 
 #define VDP_M3_HFULL   0