summaryrefslogtreecommitdiff
path: root/tinyusb/class
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-05-28 15:24:27 +0700
committerhathach <[email protected]>2013-05-28 15:24:27 +0700
commit1e5bd82af28c6005fa0ecf008e44322a6ee46461 (patch)
treee9618a6a79880a0c681a6c213d8560c286e3475f /tinyusb/class
parent7ae986de95ccb049611340164246e17ee0023c87 (diff)
rename NGX to ngx
add a bunch of stub header for dcd (175x_6x, 13xx, 18xx_43xx) add dcd_nxp_romdriver for handling usb rom driver add BIT_TEST_ in binary.h remove mw_usbd_hid.h include due to lexical conflict
Diffstat (limited to 'tinyusb/class')
-rw-r--r--tinyusb/class/hid.h66
-rw-r--r--tinyusb/class/hid_device.c62
2 files changed, 95 insertions, 33 deletions
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index 5cf9a4907..43af4d7cd 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -51,17 +51,17 @@
#ifdef __cplusplus
extern "C" {
#endif
-//
-//enum {
-// HID_SUBCLASS_NONE = 0,
-// HID_SUBCLASS_BOOT = 1
-//};
-//
-//enum {
-// HID_PROTOCOL_NONE = 0,
-// HID_PROTOCOL_KEYBOARD = 1,
-// HID_PROTOCOL_MOUSE = 2
-//};
+
+enum {
+ HID_SUBCLASS_NONE = 0,
+ HID_SUBCLASS_BOOT = 1
+};
+
+enum {
+ HID_PROTOCOL_NONE = 0,
+ HID_PROTOCOL_KEYBOARD = 1,
+ HID_PROTOCOL_MOUSE = 2
+};
enum {
HID_DESC_TYPE_HID = 0x21,
@@ -382,28 +382,28 @@ enum {
HID_USAGE_PAGE_DESKTOP = 0x01,
HID_USAGE_PAGE_SIMULATE = 0x02,
HID_USAGE_PAGE_VIRTUAL_REALITY = 0x03,
-// HID_USAGE_PAGE_SPORT = 0x04,
-// HID_USAGE_PAGE_GAME = 0x05,
-// HID_USAGE_PAGE_GENERIC_DEVICE = 0x06,
-// HID_USAGE_PAGE_KEYBOARD = 0x07,
-// HID_USAGE_PAGE_LED = 0x08,
-// HID_USAGE_PAGE_BUTTON = 0x09,
-// HID_USAGE_PAGE_ORDINAL = 0x0a,
-// HID_USAGE_PAGE_TELEPHONY = 0x0b,
-// HID_USAGE_PAGE_CONSUMER = 0x0c,
-// HID_USAGE_PAGE_DIGITIZER = 0x0d,
-// HID_USAGE_PAGE_PID = 0x0f,
-// HID_USAGE_PAGE_UNICODE = 0x10,
-// HID_USAGE_PAGE_ALPHA_DISPLAY = 0x14,
-// HID_USAGE_PAGE_MEDICAL = 0x40,
-// HID_USAGE_PAGE_MONITOR = 0x80, //0x80 - 0x83
-// HID_USAGE_PAGE_POWER = 0x84, // 0x084 - 0x87
-// HID_USAGE_PAGE_BARCODE_SCANNER = 0x8c,
-// HID_USAGE_PAGE_SCALE = 0x8d,
-// HID_USAGE_PAGE_MSR = 0x8e,
-// HID_USAGE_PAGE_CAMERA = 0x90,
-// HID_USAGE_PAGE_ARCADE = 0x91,
-// HID_USAGE_PAGE_VENDOR = 0xFFFF // 0xFF00 - 0xFFFF
+ HID_USAGE_PAGE_SPORT = 0x04,
+ HID_USAGE_PAGE_GAME = 0x05,
+ HID_USAGE_PAGE_GENERIC_DEVICE = 0x06,
+ HID_USAGE_PAGE_KEYBOARD = 0x07,
+ HID_USAGE_PAGE_LED = 0x08,
+ HID_USAGE_PAGE_BUTTON = 0x09,
+ HID_USAGE_PAGE_ORDINAL = 0x0a,
+ HID_USAGE_PAGE_TELEPHONY = 0x0b,
+ HID_USAGE_PAGE_CONSUMER = 0x0c,
+ HID_USAGE_PAGE_DIGITIZER = 0x0d,
+ HID_USAGE_PAGE_PID = 0x0f,
+ HID_USAGE_PAGE_UNICODE = 0x10,
+ HID_USAGE_PAGE_ALPHA_DISPLAY = 0x14,
+ HID_USAGE_PAGE_MEDICAL = 0x40,
+ HID_USAGE_PAGE_MONITOR = 0x80, //0x80 - 0x83
+ HID_USAGE_PAGE_POWER = 0x84, // 0x084 - 0x87
+ HID_USAGE_PAGE_BARCODE_SCANNER = 0x8c,
+ HID_USAGE_PAGE_SCALE = 0x8d,
+ HID_USAGE_PAGE_MSR = 0x8e,
+ HID_USAGE_PAGE_CAMERA = 0x90,
+ HID_USAGE_PAGE_ARCADE = 0x91,
+ HID_USAGE_PAGE_VENDOR = 0xFFFF // 0xFF00 - 0xFFFF
};
/// HID Usage Table - Table 6: Generic Desktop Page
diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c
new file mode 100644
index 000000000..02f1974aa
--- /dev/null
+++ b/tinyusb/class/hid_device.c
@@ -0,0 +1,62 @@
+/**************************************************************************/
+/*!
+ @file hid_device.c
+ @author hathach (tinyusb.org)
+
+ @section LICENSE
+
+ Software License Agreement (BSD License)
+
+ Copyright (c) 2013, hathach (tinyusb.org)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This file is part of the tinyusb stack.
+*/
+/**************************************************************************/
+
+#include "tusb_option.h"
+
+#if (MODE_DEVICE_SUPPORTED && defined HOST_CLASS_HID)
+
+#define _TINY_USB_SOURCE_FILE_
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
+#include "common/common.h"
+#include "hid_device.h"
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+
+#endif