ongoing USB development, and some refactoring

Author: bombasticbob

cores/xmega/CDC.cpp

@@ -9,20 +9,20 @@
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
 
-/* Copyright (c) 2011, Peter Barrett  
-**  
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-** 
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
-** SOFTWARE.  
+/* Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for
+** any purpose with or without fee is hereby granted, provided that the
+** above copyright notice and this permission notice appear in all copies.
+**
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+** SOFTWARE.
 */
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
 #if defined(USBCON)
 #ifdef HID_ENABLED
 
-#if __GNUC__ > 4 || (__GNUC__ > 4 && __GNUC_MINOR__ >= 6)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #define PROGMEM_ORIG PROGMEM
 #else // PROGMEM workaround
 
@@ -83,7 +83,7 @@ Keyboard_ Keyboard;
 
 extern const u8 _hidReportDescriptor[] PROGMEM;
 const u8 _hidReportDescriptor[] = {
-  
+
   //  Mouse
     0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)  // 54
     0x09, 0x02,                    // USAGE (Mouse)
@@ -120,25 +120,25 @@ const u8 _hidReportDescriptor[] = {
     0xa1, 0x01,                    // COLLECTION (Application)
     0x85, 0x02,                    //   REPORT_ID (2)
     0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
-   
+
   0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
     0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI)
     0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
     0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
     0x75, 0x01,                    //   REPORT_SIZE (1)
-    
+
   0x95, 0x08,                    //   REPORT_COUNT (8)
     0x81, 0x02,                    //   INPUT (Data,Var,Abs)
     0x95, 0x01,                    //   REPORT_COUNT (1)
     0x75, 0x08,                    //   REPORT_SIZE (8)
     0x81, 0x03,                    //   INPUT (Cnst,Var,Abs)
-    
+
   0x95, 0x06,                    //   REPORT_COUNT (6)
     0x75, 0x08,                    //   REPORT_SIZE (8)
     0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
     0x25, 0x65,                    //   LOGICAL_MAXIMUM (101)
     0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
-    
+
   0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated))
     0x29, 0x65,                    //   USAGE_MAXIMUM (Keyboard Application)
     0x81, 0x00,                    //   INPUT (Data,Ary,Abs)
@@ -236,7 +236,7 @@ bool WEAK HID_Setup(Setup& setup)
       return true;
     }
   }
-  
+
   if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
   {
     if (HID_SET_PROTOCOL == r)
@@ -262,11 +262,11 @@ Mouse_::Mouse_(void) : _buttons(0)
 {
 }
 
-void Mouse_::begin(void) 
+void Mouse_::begin(void)
 {
 }
 
-void Mouse_::end(void) 
+void Mouse_::end(void)
 {
 }
 
@@ -297,7 +297,7 @@ void Mouse_::buttons(uint8_t b)
   }
 }
 
-void Mouse_::press(uint8_t b) 
+void Mouse_::press(uint8_t b)
 {
   buttons(_buttons | b);
 }
@@ -309,7 +309,7 @@ void Mouse_::release(uint8_t b)
 
 bool Mouse_::isPressed(uint8_t b)
 {
-  if ((b & _buttons) > 0) 
+  if ((b & _buttons) > 0)
   {
     return true;
   }
@@ -321,15 +321,15 @@ bool Mouse_::isPressed(uint8_t b)
 //================================================================================
 //  Keyboard
 
-Keyboard_::Keyboard_(void) 
+Keyboard_::Keyboard_(void)
 {
 }
 
-void Keyboard_::begin(void) 
+void Keyboard_::begin(void)
 {
 }
 
-void Keyboard_::end(void) 
+void Keyboard_::end(void)
 {
 }
 
@@ -350,16 +350,16 @@ const uint8_t _asciimap[128] =
   0x00,             // ETX
   0x00,             // EOT
   0x00,             // ENQ
-  0x00,             // ACK  
+  0x00,             // ACK
   0x00,             // BEL
   0x2a,      // BS  Backspace
   0x2b,      // TAB  Tab
   0x28,      // LF  Enter
-  0x00,             // VT 
-  0x00,             // FF 
-  0x00,             // CR 
-  0x00,             // SO 
-  0x00,             // SI 
+  0x00,             // VT
+  0x00,             // FF
+  0x00,             // CR
+  0x00,             // SO
+  0x00,             // SI
   0x00,             // DEL
   0x00,             // DC1
   0x00,             // DC2
@@ -369,13 +369,13 @@ const uint8_t _asciimap[128] =
   0x00,             // SYN
   0x00,             // ETB
   0x00,             // CAN
-  0x00,             // EM 
+  0x00,             // EM
   0x00,             // SUB
   0x00,             // ESC
-  0x00,             // FS 
-  0x00,             // GS 
-  0x00,             // RS 
-  0x00,             // US 
+  0x00,             // FS
+  0x00,             // GS
+  0x00,             // RS
+  0x00,             // US
 
   0x2c,       //  ' '
   0x1e|SHIFT,     // !
@@ -468,7 +468,7 @@ const uint8_t _asciimap[128] =
   0x1b,          // x
   0x1c,          // y
   0x1d,          // z
-  0x2f|SHIFT,    // 
+  0x2f|SHIFT,    //
   0x31|SHIFT,    // |
   0x30|SHIFT,    // }
   0x35|SHIFT,    // ~
@@ -478,10 +478,10 @@ const uint8_t _asciimap[128] =
 uint8_t USBPutChar(uint8_t c);
 
 // press() adds the specified key (printing, non-printing, or modifier)
-// to the persistent key report and sends the report.  Because of the way 
-// USB HID works, the host acts like the key remains pressed until we 
+// to the persistent key report and sends the report.  Because of the way
+// USB HID works, the host acts like the key remains pressed until we
 // call release(), releaseAll(), or otherwise clear the report and resend.
-size_t Keyboard_::press(uint8_t k) 
+size_t Keyboard_::press(uint8_t k)
 {
   uint8_t i;
   if (k >= 136)    // it's a non-printing key (not a modifier)
@@ -507,10 +507,10 @@ size_t Keyboard_::press(uint8_t k)
       k &= 0x7F;
     }
   }
-  
+
   // Add k to the key report only if it's not already present
   // and if there is an empty slot.
-  if (_keyReport.keys[0] != k && _keyReport.keys[1] != k && 
+  if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
     _keyReport.keys[2] != k && _keyReport.keys[3] != k &&
     _keyReport.keys[4] != k && _keyReport.keys[5] != k)
   {
@@ -526,7 +526,7 @@ size_t Keyboard_::press(uint8_t k)
     {
       setWriteError();
       return 0;
-    }  
+    }
   }
 
   sendReport(&_keyReport);
@@ -536,7 +536,7 @@ size_t Keyboard_::press(uint8_t k)
 // release() takes the specified key out of the persistent key report and
 // sends the report.  This tells the OS the key is no longer pressed and that
 // it shouldn't be repeated any more.
-size_t Keyboard_::release(uint8_t k) 
+size_t Keyboard_::release(uint8_t k)
 {
   uint8_t i;
   if (k >= 136)
@@ -561,7 +561,7 @@ size_t Keyboard_::release(uint8_t k)
       k &= 0x7F;
     }
   }
-  
+
   // Test the key report to see if k is present.  Clear it if it exists.
   // Check all positions in case the key is present more than once (which it shouldn't be)
   for (i=0; i<6; i++)
@@ -579,17 +579,17 @@ size_t Keyboard_::release(uint8_t k)
 void Keyboard_::releaseAll(void)
 {
   _keyReport.keys[0] = 0;
-  _keyReport.keys[1] = 0;  
+  _keyReport.keys[1] = 0;
   _keyReport.keys[2] = 0;
-  _keyReport.keys[3] = 0;  
+  _keyReport.keys[3] = 0;
   _keyReport.keys[4] = 0;
-  _keyReport.keys[5] = 0;  
+  _keyReport.keys[5] = 0;
   _keyReport.modifiers = 0;
   sendReport(&_keyReport);
 }
 
 size_t Keyboard_::write(uint8_t c)
-{  
+{
   uint8_t p = press(c);    // Keydown
   uint8_t r = release(c);    // Keyup
   return (p);          // just return the result of press() since release() almost always returns 1

cores/xmega/HID.cpp

@@ -36,7 +36,7 @@
 #include "wiring_private.h"
 #include "HardwareSerial.h"
 
-#if __GNUC__ > 4 || (__GNUC__ > 4 && __GNUC_MINOR__ >= 6)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #define PROGMEM_ORIG PROGMEM
 #else // PROGMEM workaround
 
@@ -626,7 +626,7 @@ char bCTS = SERIAL_1_CTS_PORT->IN & SERIAL_1_CTS_PIN;
       bCTS ||
 #endif // SERIAL_1_CTS_ENABLED
       tx_buffer2.head == tx_buffer2.tail)
-  
+
   {
 #ifdef SERIAL_1_CTS_ENABLED
     if(bCTS)
@@ -1398,7 +1398,7 @@ void HardwareSerial::begin(unsigned long baud, byte config)
   _usart->CTRLC = config & ~(_BV(USART_CMODE1_bp)|_BV(USART_CMODE0_bp)); // make sure bits 6 and 7 are cleared
 #ifdef USARTD0_CTRLD
   _usart->CTRLD = 0;  // E5 has this register, must assign to zero
-#endif // USARTD0_CTRLD  
+#endif // USARTD0_CTRLD
 
   // assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)