From 4b6c6929cbfb4d1b92a62df84f92e83fa861f4d8 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 20 Feb 2014 16:06:31 +0700 Subject: [PATCH] fix the duplicated plug connection status change with lpc17xx by using immediate reset on isr. However Khanh's G5 mouse is not enumerated !! remove TUSB_CFG_CONFIGURATION_MAX from config file fix some warning --- demos/device/src/tusb_config.h | 33 +++++++++------------- demos/host/host_os_none/.cproject | 16 ++++++----- demos/host/host_os_none/host_os_none.uvopt | 10 +++---- demos/host/src/tusb_config.h | 31 +++++++++----------- tinyusb/common/common.h | 7 +++++ tinyusb/host/ohci/ohci.c | 6 ++-- tinyusb/host/usbh.c | 2 +- tinyusb/osal/osal_none.h | 2 +- tinyusb/tusb_option.h | 8 +++--- 9 files changed, 59 insertions(+), 56 deletions(-) diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h index dd07bc57d..41aaf468a 100644 --- a/demos/device/src/tusb_config.h +++ b/demos/device/src/tusb_config.h @@ -61,20 +61,17 @@ //--------------------------------------------------------------------+ // HOST CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_HOST_DEVICE_MAX 1 -#define TUSB_CFG_CONFIGURATION_MAX 1 - -//------------- USBD -------------// -#define TUSB_CFG_HOST_ENUM_BUFFER_SIZE 256 +#define TUSB_CFG_HOST_DEVICE_MAX 1 +#define TUSB_CFG_HOST_ENUM_BUFFER_SIZE 256 //------------- CLASS -------------// -#define TUSB_CFG_HOST_HUB 0 -#define TUSB_CFG_HOST_HID_KEYBOARD 0 -#define TUSB_CFG_HOST_HID_MOUSE 0 -#define TUSB_CFG_HOST_HID_GENERIC 0 -#define TUSB_CFG_HOST_MSC 0 -#define TUSB_CFG_HOST_CDC 0 -#define TUSB_CFG_HOST_CDC_RNDIS 0 +#define TUSB_CFG_HOST_HUB 0 +#define TUSB_CFG_HOST_HID_KEYBOARD 0 +#define TUSB_CFG_HOST_HID_MOUSE 0 +#define TUSB_CFG_HOST_HID_GENERIC 0 +#define TUSB_CFG_HOST_MSC 0 +#define TUSB_CFG_HOST_CDC 0 +#define TUSB_CFG_HOST_CDC_RNDIS 0 //--------------------------------------------------------------------+ // DEVICE CONFIGURATION @@ -85,13 +82,11 @@ #define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 -#define TUSB_CFG_DEVICE_HID_MOUSE 0 -#define TUSB_CFG_DEVICE_HID_GENERIC 0 -#define TUSB_CFG_DEVICE_MSC 0 -#define TUSB_CFG_DEVICE_CDC 1 - - +#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 +#define TUSB_CFG_DEVICE_HID_MOUSE 0 +#define TUSB_CFG_DEVICE_HID_GENERIC 0 +#define TUSB_CFG_DEVICE_MSC 0 +#define TUSB_CFG_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject index a766f338a..c68972029 100644 --- a/demos/host/host_os_none/.cproject +++ b/demos/host/host_os_none/.cproject @@ -82,7 +82,7 @@ - + @@ -170,6 +170,7 @@