summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2012-11-27 17:41:00 +0700
committerhathach <[email protected]>2012-11-27 17:41:00 +0700
commit545fe61828b3982a25b87b4ceb792c68415e4cf4 (patch)
treee858b5541c554bbc912e2b002e68df66d469d9eb /tinyusb/device
parent54e5289b730b387d7e494cce270aca47356e064f (diff)
start to add hid keyboard
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd.c17
-rw-r--r--tinyusb/device/dcd.h3
2 files changed, 13 insertions, 7 deletions
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index c41d429fb..4ae826597 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -36,8 +36,11 @@
*/
#include "dcd.h"
-#include "romdriver/power_api.h"
-#define USBD_API ((*(ROM **)(0x1FFF1FF8))->pUSBD) // TODO HAL
+
+// TODO refractor later
+#include "descriptors.h"
+
+
void dcd_init()
{
@@ -55,11 +58,11 @@ void dcd_init()
USB_CORE_DESCS_T DeviceDes =
{
-// .device_desc = (uint8_t*) &USB_DeviceDescriptor,
-// .string_desc = (uint8_t*) &USB_StringDescriptor,
-// .full_speed_desc = (uint8_t*) &USB_FsConfigDescriptor,
-// .high_speed_desc = (uint8_t*) &USB_FsConfigDescriptor,
-// .device_qualifier = NULL
+ .device_desc = (uint8_t*) &USB_DeviceDescriptor,
+ .string_desc = (uint8_t*) &USB_StringDescriptor,
+ .full_speed_desc = (uint8_t*) &USB_FsConfigDescriptor,
+ .high_speed_desc = (uint8_t*) &USB_FsConfigDescriptor,
+ .device_qualifier = NULL
};
USBD_HANDLE_T g_hUsb;
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index d9cf2fc85..836669e7e 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -43,9 +43,12 @@
#endif
#include "tusb_cfg.h"
+#include "common/common.h"
#ifdef DEVICE_ROMDRIVER
#include "romdriver/mw_usbd_rom_api.h"
+#include "romdriver/power_api.h"
+#define USBD_API ((*(ROM **)(0x1FFF1FF8))->pUSBD) // TODO HAL
#endif