From 0757d2eb6cc7de6d3cafc2280ac214d1181e8c7f Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 14 Mar 2014 15:11:57 +0700 Subject: [PATCH] more warnings clean up --- demos/host/host_os_none/.cproject | 10 +- tinyusb/class/hid.h | 146 +++++++++++++++--------------- tinyusb/common/tusb_types.h | 23 ----- tinyusb/host/usbh.h | 6 -- 4 files changed, 78 insertions(+), 107 deletions(-) diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject index 1d510fa1..6a5b7c0b 100644 --- a/demos/host/host_os_none/.cproject +++ b/demos/host/host_os_none/.cproject @@ -8,7 +8,7 @@ - + @@ -3129,7 +3129,7 @@ - + @@ -4689,7 +4689,7 @@ - + @@ -6249,7 +6249,7 @@ - + @@ -7806,7 +7806,7 @@ - + diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h index 017223c0..91a7ece3 100644 --- a/tinyusb/class/hid.h +++ b/tinyusb/class/hid.h @@ -210,82 +210,82 @@ typedef enum { /// @} #define HID_KEYCODE_TABLE(ENTRY) \ - ENTRY( 0x04, 'a', 'A' )\ - ENTRY( 0x05, 'b', 'B' )\ - ENTRY( 0x06, 'c', 'C' )\ - ENTRY( 0x07, 'd', 'D' )\ - ENTRY( 0x08, 'e', 'E' )\ - ENTRY( 0x09, 'f', 'F' )\ - ENTRY( 0x0a, 'g', 'G' )\ - ENTRY( 0x0b, 'h', 'H' )\ - ENTRY( 0x0c, 'i', 'I' )\ - ENTRY( 0x0d, 'j', 'J' )\ - ENTRY( 0x0e, 'k', 'K' )\ - ENTRY( 0x0f, 'l', 'L' )\ + ENTRY( 0x04, 'a' , 'A' )\ + ENTRY( 0x05, 'b' , 'B' )\ + ENTRY( 0x06, 'c' , 'C' )\ + ENTRY( 0x07, 'd' , 'D' )\ + ENTRY( 0x08, 'e' , 'E' )\ + ENTRY( 0x09, 'f' , 'F' )\ + ENTRY( 0x0a, 'g' , 'G' )\ + ENTRY( 0x0b, 'h' , 'H' )\ + ENTRY( 0x0c, 'i' , 'I' )\ + ENTRY( 0x0d, 'j' , 'J' )\ + ENTRY( 0x0e, 'k' , 'K' )\ + ENTRY( 0x0f, 'l' , 'L' )\ + ENTRY( 0x10, 'm' , 'M' )\ + ENTRY( 0x11, 'n' , 'N' )\ + ENTRY( 0x12, 'o' , 'O' )\ + ENTRY( 0x13, 'p' , 'P' )\ + ENTRY( 0x14, 'q' , 'Q' )\ + ENTRY( 0x15, 'r' , 'R' )\ + ENTRY( 0x16, 's' , 'S' )\ + ENTRY( 0x17, 't' , 'T' )\ + ENTRY( 0x18, 'u' , 'U' )\ + ENTRY( 0x19, 'v' , 'V' )\ + ENTRY( 0x1a, 'w' , 'W' )\ + ENTRY( 0x1b, 'x' , 'X' )\ + ENTRY( 0x1c, 'y' , 'Y' )\ + ENTRY( 0x1d, 'z' , 'Z' )\ \ - ENTRY( 0x10, 'm', 'M' )\ - ENTRY( 0x11, 'n', 'N' )\ - ENTRY( 0x12, 'o', 'O' )\ - ENTRY( 0x13, 'p', 'P' )\ - ENTRY( 0x14, 'q', 'Q' )\ - ENTRY( 0x15, 'r', 'R' )\ - ENTRY( 0x16, 's', 'S' )\ - ENTRY( 0x17, 't', 'T' )\ - ENTRY( 0x18, 'u', 'U' )\ - ENTRY( 0x19, 'v', 'V' )\ - ENTRY( 0x1a, 'w', 'W' )\ - ENTRY( 0x1b, 'x', 'X' )\ - ENTRY( 0x1c, 'y', 'Y' )\ - ENTRY( 0x1d, 'z', 'Z' )\ - ENTRY( 0x1e, '1', '!' )\ - ENTRY( 0x1f, '2', '@' )\ + ENTRY( 0x1e, '1' , '!' )\ + ENTRY( 0x1f, '2' , '@' )\ + ENTRY( 0x20, '3' , '#' )\ + ENTRY( 0x21, '4' , '$' )\ + ENTRY( 0x22, '5' , '%' )\ + ENTRY( 0x23, '6' , '^' )\ + ENTRY( 0x24, '7' , '&' )\ + ENTRY( 0x25, '8' , '*' )\ + ENTRY( 0x26, '9' , '(' )\ + ENTRY( 0x27, '0' , ')' )\ \ - ENTRY( 0x20, '3', '#' )\ - ENTRY( 0x21, '4', '$' )\ - ENTRY( 0x22, '5', '%' )\ - ENTRY( 0x23, '6', '^' )\ - ENTRY( 0x24, '7', '&' )\ - ENTRY( 0x25, '8', '*' )\ - ENTRY( 0x26, '9', '(' )\ - ENTRY( 0x27, '0', ')' )\ - ENTRY( 0x28, '\r', '\r' )\ - ENTRY( 0x29, '\e', '\e' )\ - ENTRY( 0x2a, '\b', '\b' )\ - ENTRY( 0x2b, '\t', '\t' )\ - ENTRY( 0x2c, ' ', ' ' )\ - ENTRY( 0x2d, '-', '_' )\ - ENTRY( 0x2e, '=', '+' )\ - ENTRY( 0x2f, '[', '{' )\ + ENTRY( 0x28, '\r' , '\r' )\ + ENTRY( 0x29, '\x1b', '\x1b' )\ + ENTRY( 0x2a, '\b' , '\b' )\ + ENTRY( 0x2b, '\t' , '\t' )\ + ENTRY( 0x2c, ' ' , ' ' )\ + ENTRY( 0x2d, '-' , '_' )\ + ENTRY( 0x2e, '=' , '+' )\ + ENTRY( 0x2f, '[' , '{' )\ + ENTRY( 0x30, ']' , '}' )\ + ENTRY( 0x31, '\\' , '|' )\ + ENTRY( 0x32, '#' , '~' ) /* TODO non-US keyboard */ \ + ENTRY( 0x33, ';' , ':' )\ + ENTRY( 0x34, '\'' , '\"' )\ + ENTRY( 0x35, 0 , 0 )\ + ENTRY( 0x36, ',' , '<' )\ + ENTRY( 0x37, '.' , '>' )\ + ENTRY( 0x38, '/' , '?' )\ + ENTRY( 0x39, 0 , 0 ) /* TODO CapsLock, non-locking key implementation*/ \ \ - ENTRY( 0x30, ']', '}' )\ - ENTRY( 0x31, '\\', '|' )\ - ENTRY( 0x32, '#', '~' ) /* TODO non-US keyboard */ \ - ENTRY( 0x33, ';', ':' )\ - ENTRY( 0x34, '\'', '\"' )\ - ENTRY( 0x35, 0, 0 )\ - ENTRY( 0x36, ',', '<' )\ - ENTRY( 0x37, '.', '>' )\ - ENTRY( 0x38, '/', '?' )\ - ENTRY( 0x39, 0, 0 ) /* TODO CapsLock, non-locking key implementation*/ \ - \ - ENTRY( 0x54, '/', '/' )\ - ENTRY( 0x55, '*', '*' )\ - ENTRY( 0x56, '-', '-' )\ - ENTRY( 0x57, '+', '+' )\ - ENTRY( 0x58, '\r', '\r' )\ - ENTRY( 0x59, '1', 0 ) /* numpad1 & end */ \ - ENTRY( 0x5a, '2', 0 )\ - ENTRY( 0x5b, '3', 0 )\ - ENTRY( 0x5c, '4', 0 )\ - ENTRY( 0x5d, '5', '5' )\ - ENTRY( 0x5e, '6', 0 )\ - ENTRY( 0x5f, '7', 0 )\ - ENTRY( 0x60, '8', 0 )\ - ENTRY( 0x61, '9', 0 )\ - ENTRY( 0x62, '0', 0 )\ - ENTRY( 0x63, '0', 0 )\ - \ - ENTRY( 0x67, '=', '=' )\ + ENTRY( 0x54, '/' , '/' )\ + ENTRY( 0x55, '*' , '*' )\ + ENTRY( 0x56, '-' , '-' )\ + ENTRY( 0x57, '+' , '+' )\ + ENTRY( 0x58, '\r' , '\r' )\ + ENTRY( 0x59, '1' , 0 ) /* numpad1 & end */ \ + ENTRY( 0x5a, '2' , 0 )\ + ENTRY( 0x5b, '3' , 0 )\ + ENTRY( 0x5c, '4' , 0 )\ + ENTRY( 0x5d, '5' , '5' )\ + ENTRY( 0x5e, '6' , 0 )\ + ENTRY( 0x5f, '7' , 0 )\ + ENTRY( 0x60, '8' , 0 )\ + ENTRY( 0x61, '9' , 0 )\ + ENTRY( 0x62, '0' , 0 )\ + ENTRY( 0x63, '0' , 0 )\ + ENTRY( 0x67, '=' , '=' )\ + + // TODO HID complete keycode table diff --git a/tinyusb/common/tusb_types.h b/tinyusb/common/tusb_types.h index 72563e57..21738fce 100644 --- a/tinyusb/common/tusb_types.h +++ b/tinyusb/common/tusb_types.h @@ -152,29 +152,6 @@ typedef enum { MISC_PROTOCOL_IAD = 1 }misc_protocol_type_t; -typedef enum { - TUSB_CLASS_FLAG_AUDIO = BIT_(TUSB_CLASS_AUDIO) , ///< 1 - TUSB_CLASS_FLAG_CDC = BIT_(TUSB_CLASS_CDC) , ///< 2 - TUSB_CLASS_FLAG_HID = BIT_(TUSB_CLASS_HID) , ///< 3 - TUSB_CLASS_FLAG_PHYSICAL = BIT_(TUSB_CLASS_PHYSICAL) , ///< 5 - TUSB_CLASS_FLAG_IMAGE = BIT_(TUSB_CLASS_IMAGE) , ///< 6 - TUSB_CLASS_FLAG_PRINTER = BIT_(TUSB_CLASS_PRINTER) , ///< 7 - TUSB_CLASS_FLAG_MSC = BIT_(TUSB_CLASS_MSC) , ///< 8 - TUSB_CLASS_FLAG_HUB = BIT_(TUSB_CLASS_HUB) , ///< 9 - TUSB_CLASS_FLAG_CDC_DATA = BIT_(TUSB_CLASS_CDC_DATA) , ///< 10 - TUSB_CLASS_FLAG_SMART_CARD = BIT_(TUSB_CLASS_SMART_CARD) , ///< 11 - TUSB_CLASS_FLAG_CONTENT_SECURITY = BIT_(TUSB_CLASS_CONTENT_SECURITY) , ///< 13 - TUSB_CLASS_FLAG_VIDEO = BIT_(TUSB_CLASS_VIDEO) , ///< 14 - TUSB_CLASS_FLAG_PERSONAL_HEALTHCARE = BIT_(TUSB_CLASS_PERSONAL_HEALTHCARE) , ///< 15 - TUSB_CLASS_FLAG_AUDIO_VIDEO = BIT_(TUSB_CLASS_AUDIO_VIDEO) , ///< 16 - - TUSB_CLASS_FLAG_DIAGNOSTIC = BIT_(27) , - TUSB_CLASS_FLAG_WIRELESS_CONTROLLER = BIT_(28) , - TUSB_CLASS_FLAG_MISC = BIT_(29) , - TUSB_CLASS_FLAG_APPLICATION_SPECIFIC = BIT_(30) , - TUSB_CLASS_FLAG_VENDOR_SPECIFIC = BIT_(31) -} tusb_std_class_flag_t; - enum { TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP = BIT_(5), TUSB_DESC_CONFIG_ATT_SELF_POWER = BIT_(6), diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h index aff39f33..d828d4bb 100644 --- a/tinyusb/host/usbh.h +++ b/tinyusb/host/usbh.h @@ -36,12 +36,6 @@ */ /**************************************************************************/ -/** \file - * \brief TBD - * - * \note TBD - */ - /** \ingroup TBD * \defgroup TBD * \brief TBD