Use immediate variable expansion in the second-deepest level makefile scripts to...

[pub/USBasp.git] / LUFA / Drivers / Board / XMEGA / A3BU_XPLAINED / Buttons.h

diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
index aa08354..8146ee3 100644 (file)
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
@@ -7,7 +7,7 @@
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -42,6 +42,13 @@
  *
  *  Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
  *
+ *  <table>
+ *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
+ *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>PORTE.5</td></tr>
+ *    <tr><td>BUTTONS_BUTTON2</td><td>SW1 Button</td><td>Low</td><td>PORTF.1</td></tr>
+ *    <tr><td>BUTTONS_BUTTON3</td><td>SW2 Button</td><td>Low</td><td>PORTF.2</td></tr>
+ *  </table>
+ *
  *  @{
  */
 
@@ -76,28 +83,28 @@
                #if !defined(__DOXYGEN__)
                        static inline void Buttons_Init(void)
                        {
-                               PORTE_OUTCLR = BUTTONS_BUTTON1;
-                               PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+                               PORTE.OUTCLR   = BUTTONS_BUTTON1;
+                               PORTE.PIN5CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
 
-                               PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc;
-                               PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc;
-                               PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc;
+                               PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+                               PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
+                               PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
                        }
 
                        static inline void Buttons_Disable(void)
                        {
-                               PORTE_OUTCLR = BUTTONS_BUTTON1;
-                               PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
-
-                               PORTE_PIN5CTRL = 0;
-                               PORTF_PIN1CTRL = 0;
-                               PORTF_PIN2CTRL = 0;
+                               PORTE.OUTCLR   = BUTTONS_BUTTON1;
+                               PORTE.PIN5CTRL = 0;
+                               
+                               PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+                               PORTF.PIN1CTRL = 0;
+                               PORTF.PIN2CTRL = 0;
                        }
 
                        static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
                        static inline uint8_t Buttons_GetStatus(void)
                        {
-                               return ((~PORTE_IN & BUTTONS_BUTTON1) | (~PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
+                               return ((PORTE_IN & BUTTONS_BUTTON1) | (PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
                        }
                #endif