fixed dcd lpc17xx queue transfer & IOC handling

able to run MSC demo

3 files changed, 35 insertions, 5 deletions

diff --git a/demos/device/device_os_none/mscd_app.h b/demos/device/device_os_none/mscd_app.h
index 08c2c8015..4bbd91da1 100644
--- a/demos/device/device_os_none/mscd_app.h
+++ b/demos/device/device_os_none/mscd_app.h
@@ -61,10 +61,10 @@ enum
   DISK_BLOCK_SIZE = 512

 };

 

-#if MCU==MCU_LPC43XX

-  #define MSCD_APP_RAMDISK

-#else // defaults is rom disk

+#if MCU==MCU_LPC11UXX || MCU==MCU_LPC13UXX

   #define MSCD_APP_ROMDISK

+#else // defaults is ram disk

+  #define MSCD_APP_RAMDISK

 #endif

 

 void msc_dev_app_init(void);

diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h
index b7f7425cc..2d7ef1ff3 100644
--- a/demos/device/device_os_none/tusb_config.h
+++ b/demos/device/device_os_none/tusb_config.h
@@ -84,8 +84,8 @@
 #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_MSC           1

+#define TUSB_CFG_DEVICE_CDC           0

 

 

 //--------------------------------------------------------------------+

diff --git a/demos/device/device_os_none/tusb_descriptors.h b/demos/device/device_os_none/tusb_descriptors.h
index b664e06a5..040114ba9 100644
--- a/demos/device/device_os_none/tusb_descriptors.h
+++ b/demos/device/device_os_none/tusb_descriptors.h
@@ -74,6 +74,34 @@
 #define EDPT_IN(x)    (0x80 | (x))
 #define EDPT_OUT(x)   (x)
 
+#if MCU == MCU_LPC175X_6X
+//------------- These MCUs's endpoint number has a fixed type -------------//
+//------------- CDC -------------//
+#define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (1)
+#define CDC_EDPT_NOTIFICATION_PACKETSIZE      64
+
+#define CDC_EDPT_DATA_OUT_ADDR                EDPT_OUT(2)
+#define CDC_EDPT_DATA_IN_ADDR                 EDPT_IN (2)
+#define CDC_EDPT_DATA_PACKETSIZE              64
+
+//------------- HID Keyboard -------------//
+#define HID_KEYBOARD_EDPT_ADDR                EDPT_IN (4)
+#define HID_KEYBOARD_EDPT_PACKETSIZE          8
+
+//------------- HID Mouse -------------//
+#define HID_MOUSE_EDPT_ADDR                   EDPT_IN (7)
+#define HID_MOUSE_EDPT_PACKETSIZE             8
+
+//------------- HID Generic -------------//
+
+//------------- Mass Storage -------------//
+#define MSC_EDPT_OUT_ADDR                     EDPT_OUT(5)
+#define MSC_EDPT_IN_ADDR                      EDPT_IN (5)
+#define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)
+
+
+#else
+
 //------------- CDC -------------//
 #define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (INTERFACE_NUM_CDC+1)
 #define CDC_EDPT_NOTIFICATION_PACKETSIZE      64
@@ -97,6 +125,8 @@
 #define MSC_EDPT_IN_ADDR                      EDPT_IN (INTERFACE_NUM_MSC+1)
 #define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)
 
+#endif
+
 //--------------------------------------------------------------------+
 // CONFIGURATION DESCRIPTOR
 //--------------------------------------------------------------------+