Add branch for the conversion of demos to use standard C header files for configurati...

[pub/lufa.git] / LUFA / Drivers / Board / AVR8 / USB2AX / LEDs.h

diff --git a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
index c34715e..12fa73c 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
@@ -51,6 +51,18 @@
  *\r
  *  Board specific LED driver header for the Paranoid Studio USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).\r
  *\r
  *\r
  *  Board specific LED driver header for the Paranoid Studio USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).\r
  *\r

+ *  <b>USB2AX</b>:\r
+ *  <table>\r
+ *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r
+ *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTC.6</td></tr>\r
+ *  </table>\r
+ *\r
+ *  <b>USB2AX_V3</b>:\r
+ *  <table>\r
+ *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>\r
+ *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.1</td></tr>\r
+ *  </table>\r
+ *\r

  *  @{\r
  */\r
 \r
  *  @{\r
  */\r
 \r


@@ -96,11 +108,11 @@
                        static inline void LEDs_Init(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline void LEDs_Init(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               DDRC  |= LEDS_ALL_LEDS;\r
-                               PORTC |= LEDS_ALL_LEDS;                         \r
+                               DDRC  |=  LEDS_ALL_LEDS;\r
+                               PORTC &= ~LEDS_ALL_LEDS;                                \r

                                #else\r
                                #else\r

-                               DDRD  |= LEDS_ALL_LEDS;\r
-                               PORTD |= LEDS_ALL_LEDS;                         \r
+                               DDRD  |=  LEDS_ALL_LEDS;\r
+                               PORTD &= ~LEDS_ALL_LEDS;                                \r

                                #endif                          \r
                        }\r
 \r
                                #endif                          \r
                        }\r
 \r


@@ -118,27 +130,27 @@
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC &= ~LEDMask;                              \r
+                               PORTC |= LEDMask;                               \r

                                #else\r
                                #else\r

-                               PORTD &= ~LEDMask;\r
+                               PORTD |= LEDMask;\r

                                #endif\r
                        }\r
 \r
                        static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                #endif\r
                        }\r
 \r
                        static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC |= LEDMask;\r
+                               PORTC &= ~LEDMask;\r

                                #else\r
                                #else\r

-                               PORTD |= LEDMask;\r
+                               PORTD &= ~LEDMask;\r

                                #endif\r
                        }\r
 \r
                        static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                #endif\r
                        }\r
 \r
                        static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);                           \r
+                               PORTC = ((PORTC & ~LEDS_ALL_LEDS) | LEDMask);                           \r

                                #else\r
                                #else\r

-                               PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);\r
+                               PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);\r

                                #endif\r
                        }\r
 \r
                                #endif\r
                        }\r
 \r


@@ -146,18 +158,18 @@
                                                           const uint8_t ActiveMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                                           const uint8_t ActiveMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC = ((PORTC | LEDMask) & ~ActiveMask);                              \r
+                               PORTC = ((PORTC & ~LEDMask) | ActiveMask);                              \r

                                #else\r
                                #else\r

-                               PORTD = ((PORTD | LEDMask) & ~ActiveMask);\r
+                               PORTD = ((PORTD & ~LEDMask) | ActiveMask);\r

                                #endif\r
                        }\r
 \r
                        static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                                #endif\r
                        }\r
 \r
                        static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               PORTC ^= LEDMask;                               \r
+                               PINC  = LEDMask;                                \r

                                #else\r
                                #else\r

-                               PORTD ^= LEDMask;\r
+                               PIND  = LEDMask;\r

                                #endif\r
                        }\r
 \r
                                #endif\r
                        }\r
 \r


@@ -165,9 +177,9 @@
                        static inline uint8_t LEDs_GetLEDs(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r
                        static inline uint8_t LEDs_GetLEDs(void)\r
                        {\r
                                #if (BOARD == BOARD_USB2AX)\r

-                               return (~PORTC & LEDS_ALL_LEDS);                                \r
+                               return (PORTC & LEDS_ALL_LEDS);                         \r

                                #else\r
                                #else\r

-                               return (~PORTD & LEDS_ALL_LEDS);\r
+                               return (PORTD & LEDS_ALL_LEDS);\r

                                #endif\r
                        }\r
                #endif\r
                                #endif\r
                        }\r
                #endif\r