diff options
| author | hathach <[email protected]> | 2013-06-12 14:06:41 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-06-12 14:06:41 +0700 |
| commit | ee57a6f13fcd8b75611713e3bec5a07202cc8f5a (patch) | |
| tree | 2ed75bea1ff315ac82aa15446d82d84f0a298d90 /demos | |
| parent | 17a27f7398c2807796432bbca5e90d97f09ae051 (diff) | |
clean up
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/device/keyboard/main.c | 4 | ||||
| -rw-r--r-- | demos/device/keyboard/tusb_config.h | 2 | ||||
| -rw-r--r-- | demos/device/keyboard/tusb_descriptors.h | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/demos/device/keyboard/main.c b/demos/device/keyboard/main.c index f8af02c61..f7d24cbe6 100644 --- a/demos/device/keyboard/main.c +++ b/demos/device/keyboard/main.c @@ -93,6 +93,7 @@ void led_blinking_task(void * p_para) #if TUSB_CFG_DEVICE_HID_KEYBOARD void keyboard_device_app_task(void * p_para) { +#if 1 if (tusb_device_is_configured()) { static uint32_t count =0; @@ -106,12 +107,14 @@ void keyboard_device_app_task(void * p_para) ); } } +#endif } #endif #if TUSB_CFG_DEVICE_HID_MOUSE void mouse_device_app_task(void * p_para) { +#if 1 if (tusb_device_is_configured()) { static uint32_t count =0; @@ -124,6 +127,7 @@ void mouse_device_app_task(void * p_para) .y = 20 } ); } } +#endif } #endif diff --git a/demos/device/keyboard/tusb_config.h b/demos/device/keyboard/tusb_config.h index 8e4b635a4..7dc912eeb 100644 --- a/demos/device/keyboard/tusb_config.h +++ b/demos/device/keyboard/tusb_config.h @@ -93,7 +93,7 @@ #define TUSB_CFG_DEVICE_CONTROL_PACKET_SIZE 64 //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 +#define TUSB_CFG_DEVICE_HID_KEYBOARD 1 #define TUSB_CFG_DEVICE_HID_MOUSE 0 #define TUSB_CFG_DEVICE_HID_GENERIC 0 #define TUSB_CFG_DEVICE_MSC 0 diff --git a/demos/device/keyboard/tusb_descriptors.h b/demos/device/keyboard/tusb_descriptors.h index 7e092a7da..2cdee40cf 100644 --- a/demos/device/keyboard/tusb_descriptors.h +++ b/demos/device/keyboard/tusb_descriptors.h @@ -109,6 +109,13 @@ typedef ATTR_PACKED_STRUCT(struct) tusb_descriptor_endpoint_t mouse_endpoint; #endif +//------------- Mass Storage -------------// +#if TUSB_CFG_DEVICE_MSC + tusb_descriptor_interface_t msc_interface; + tusb_descriptor_endpoint_t msc_endpoint_in; + tusb_descriptor_endpoint_t msc_endpoint_out; +#endif + uint8_t null_termination; // NXP rom driver requires this to work } app_descriptor_configuration_t; |