Fixes from picbtnisr work

[rgblamp.git] / btn.h

diff --git a/btn.h b/btn.h
index 857ec6f39ccde14f3c2e6a51e8ebf8bda336ad3b..e0ce0aeb1498f8150d618ff331517ec91a9f5196 100644 (file)
--- a/btn.h
+++ b/btn.h
@@ -32,53 +32,33 @@ enum {
 /* Read the current state of the rocker switch */
 #define btn_rs() ((RB4 + ((unsigned char)RB5 << 1)) % 3)
 
-/* Enable the pushbutton from ISR */
-#define _btn_pben() do { \
-    IOCBP0 = 1; IOCBN0 = 1; IOCBF0 = 0; \
-  } while (0)
-
-/* Disable the pushbutton from ISR */
-#define _btn_pbdis() do { \
-    IOCBP0 = 0; IOCBN0 = 0; IOCBF0 = 0; \
-  } while (0)
-
-/* Enable the rocker switch from ISR */
-#define _btn_rsen() do { \
-    IOCBP4 = 1; IOCBN4 = 1; IOCBF4 = 0; \
-    IOCBP5 = 1; IOCBN5 = 1; IOCBF5 = 0; \
-  } while (0)
-
-/* Disable the rocker switch from ISR */
-#define _btn_rsdis() do { \
-    IOCBP4 = 0; IOCBN4 = 0; IOCBF4 = 0; \
-    IOCBP5 = 0; IOCBN5 = 0; IOCBF5 = 0; \
-  } while (0)
-
 /* Enable the pushbutton from user code */
 #define btn_pben() do { \
     ndi(); \
-    _btn_pben(); \
+    IOCBP0 = 1; IOCBN0 = 1; IOCBF0 = 0; \
     nei(); \
   } while (0)
 
 /* Disable the pushbutton from user code */
 #define btn_pbdis() do { \
     ndi(); \
-    _btn_pbdis(); \
+    IOCBP0 = 0; IOCBN0 = 0; IOCBF0 = 0; \
     nei(); \
   } while (0)
 
 /* Enable the rocker switch from user code */
 #define btn_rsen() do { \
     ndi(); \
-    _btn_rsen(); \
+    IOCBP4 = 1; IOCBN4 = 1; IOCBF4 = 0; \
+    IOCBP5 = 1; IOCBN5 = 1; IOCBF5 = 0; \
     nei(); \
   } while (0)
 
 /* Disable the rocker switch from user code */
 #define btn_rsdis() do { \
     ndi(); \
-    _btn_rsdis(); \
+    IOCBP4 = 0; IOCBN4 = 0; IOCBF4 = 0; \
+    IOCBP5 = 0; IOCBN5 = 0; IOCBF5 = 0; \
     nei(); \
   } while (0)