X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=ROM2%2Fvend.h;h=03d8c9e888266cd3bc856fe1cd363d74a94870ff;hb=f617d42026fbf5d614c85686ba1f26eb47853658;hp=11c483d14729a3a99966b36de772231a9aec9603;hpb=080c85d87da93ba2472b0c90d17527838d668db2;p=uccvend-snackrom.git

diff --git a/ROM2/vend.h b/ROM2/vend.h
index 11c483d..03d8c9e 100644
--- 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);