A better fix for wacky gcc weirdness.

[uccvend-snackrom.git] / ROM2 / vend.h

diff --git a/ROM2/vend.h b/ROM2/vend.h
index 11c483d..03d8c9e 100644 (file)
--- a/ROM2/vend.h
+++ b/ROM2/vend.h
@@ -11,16 +11,10 @@
  */
 #define buffered_addr(a) \
        extern volatile u8 _##a;          \
-       u8 a; \
+       volatile u8 a; \
        extern inline void set_##a(u8 b) { a = b; _##a = b; } \
-       extern inline void bset_##a(const u8 m) { \
-               bset(&a, m); \
-               asm volatile ( "ldab %1\nstab %0\n" \
-                               : "=m"(_##a) : "m"(a) : "d"); } \
-       extern inline void bclr_##a(const u8 m) { \
-               bclr(&a, m); \
-               asm volatile ( "ldab %1\nstab %0\n" \
-                               : "=m"(_##a) : "m"(a) : "d"); }
+       extern inline void bset_##a(const u8 m) { bset((void*)&a, m); _##a = a; } \
+       extern inline void bclr_##a(const u8 m) { bclr((void*)&a, m); _##a = a; }
 
 buffered_addr(changer_output);
 buffered_addr(misc_output);