X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=btn.h;h=c4263d5c00400408531373538303c0ea743c10be;hb=82184529ca82b955e227b50ad07837f14619a055;hp=857ec6f39ccde14f3c2e6a51e8ebf8bda336ad3b;hpb=d7221e9aeb82c97fbbff18963ef69a300b3d0cd3;p=rgblamp.git

diff --git a/btn.h b/btn.h
index 857ec6f..c4263d5 100644
--- a/btn.h
+++ b/btn.h
@@ -21,66 +21,29 @@ enum {
   BTN_PB_DOWN = 0,
   BTN_PB_UP,
 
-  BTN_RS_OFF = 0,
+  BTN_RS_NONE = 0,
   BTN_RS_LEFT,
   BTN_RS_RIGHT,
+  BTN_RS_OFF,
 };
 
 /* Read the current state of the pushbutton */
-#define btn_pb() (RB0)
+#define btn_pb() (RB1)
 
 /* 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)
+#define btn_rs() (RB2 + ((unsigned char)RB4 << 1))
 
 /* Enable the pushbutton from user code */
-#define btn_pben() do { \
-    ndi(); \
-    _btn_pben(); \
-    nei(); \
-  } while (0)
+void btn_pben();
 
 /* Disable the pushbutton from user code */
-#define btn_pbdis() do { \
-    ndi(); \
-    _btn_pbdis(); \
-    nei(); \
-  } while (0)
+void btn_pbdis();
 
 /* Enable the rocker switch from user code */
-#define btn_rsen() do { \
-    ndi(); \
-    _btn_rsen(); \
-    nei(); \
-  } while (0)
+void btn_rsen();
 
 /* Disable the rocker switch from user code */
-#define btn_rsdis() do { \
-    ndi(); \
-    _btn_rsdis(); \
-    nei(); \
-  } while (0)
+void btn_rsdis();
 
 /* Initialize the button module */
 void btn_init();