X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=btn.h;h=093298bb86c66b0134bf63396e62bf2fe0b31652;hb=09441b496c6b40be151e4e655572cb37518e7225;hp=e0ce0aeb1498f8150d618ff331517ec91a9f5196;hpb=8381b2e127303cc81feccf0a1b6b65b59ee1155e;p=rgblamp.git

diff --git a/btn.h b/btn.h
index e0ce0ae..093298b 100644
--- a/btn.h
+++ b/btn.h
@@ -30,37 +30,19 @@ enum {
 #define btn_pb() (RB0)
 
 /* Read the current state of the rocker switch */
-#define btn_rs() ((RB4 + ((unsigned char)RB5 << 1)) % 3)
+#define btn_rs() (RB4 + ((unsigned char)RB5 << 1))
 
 /* Enable the pushbutton from user code */
-#define btn_pben() do { \
-    ndi(); \
-    IOCBP0 = 1; IOCBN0 = 1; IOCBF0 = 0; \
-    nei(); \
-  } while (0)
+void btn_pben();
 
 /* Disable the pushbutton from user code */
-#define btn_pbdis() do { \
-    ndi(); \
-    IOCBP0 = 0; IOCBN0 = 0; IOCBF0 = 0; \
-    nei(); \
-  } while (0)
+void btn_pbdis();
 
 /* Enable the rocker switch from user code */
-#define btn_rsen() do { \
-    ndi(); \
-    IOCBP4 = 1; IOCBN4 = 1; IOCBF4 = 0; \
-    IOCBP5 = 1; IOCBN5 = 1; IOCBF5 = 0; \
-    nei(); \
-  } while (0)
+void btn_rsen();
 
 /* Disable the rocker switch from user code */
-#define btn_rsdis() do { \
-    ndi(); \
-    IOCBP4 = 0; IOCBN4 = 0; IOCBF4 = 0; \
-    IOCBP5 = 0; IOCBN5 = 0; IOCBF5 = 0; \
-    nei(); \
-  } while (0)
+void btn_rsdis();
 
 /* Initialize the button module */
 void btn_init();