Merge pull request #17 from hathach/devlocal

dcd lpc17xx update

3 files changed, 57 insertions, 26 deletions

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 8c7e588e0..81fcfe959 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -170,7 +170,7 @@ static osal_queue_t _usbd_q;
 //--------------------------------------------------------------------+

 static void mark_interface_endpoint(uint8_t const* p_desc, uint16_t desc_len, uint8_t driver_id);

 static bool process_control_request(uint8_t rhport, tusb_control_request_t const * p_request);

-static bool process_set_config(uint8_t rhport, uint8_t config_number);

+static bool process_set_config(uint8_t rhport);

 static void const* get_descriptor(tusb_control_request_t const * p_request, uint16_t* desc_len);

 

 void usbd_control_reset (uint8_t rhport);

@@ -356,7 +356,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         dcd_set_config(rhport, config);

         _usbd_dev.config_num = config;

 

-        TU_ASSERT( TUSB_ERROR_NONE == process_set_config(rhport, config) );

+        TU_ASSERT( TUSB_ERROR_NONE == process_set_config(rhport) );

       }

       break;

 

@@ -427,7 +427,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
 

 // Process Set Configure Request

 // This function parse configuration descriptor & open drivers accordingly

-static bool process_set_config(uint8_t rhport, uint8_t config_number)

+static bool process_set_config(uint8_t rhport)

 {

   uint8_t const * desc_cfg = (uint8_t const *) usbd_desc_set->config;

   TU_ASSERT(desc_cfg != NULL);

@@ -591,23 +591,23 @@ void dcd_event_handler(dcd_event_t const * event, bool in_isr)
 // helper to send bus signal event

 void dcd_event_bus_signal (uint8_t rhport, dcd_eventid_t eid, bool in_isr)

 {

-  dcd_event_t event = { .rhport = 0, .event_id = eid, };

+  dcd_event_t event = { .rhport = rhport, .event_id = eid, };

   dcd_event_handler(&event, in_isr);

 }

 

 // helper to send setup received

 void dcd_event_setup_received(uint8_t rhport, uint8_t const * setup, bool in_isr)

 {

-  dcd_event_t event = { .rhport = 0, .event_id = DCD_EVENT_SETUP_RECEIVED };

+  dcd_event_t event = { .rhport = rhport, .event_id = DCD_EVENT_SETUP_RECEIVED };

   memcpy(&event.setup_received, setup, 8);

 

-  dcd_event_handler(&event, true);

+  dcd_event_handler(&event, in_isr);

 }

 

 // helper to send transfer complete event

 void dcd_event_xfer_complete (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes, uint8_t result, bool in_isr)

 {

-  dcd_event_t event = { .rhport = 0, .event_id = DCD_EVENT_XFER_COMPLETE };

+  dcd_event_t event = { .rhport = rhport, .event_id = DCD_EVENT_XFER_COMPLETE };

 

   event.xfer_complete.ep_addr = ep_addr;

   event.xfer_complete.len     = xferred_bytes;

diff --git a/src/device/usbd_auto_desc.c b/src/device/usbd_auto_desc.c
index 2d54a934d..028d1b433 100644
--- a/src/device/usbd_auto_desc.c
+++ b/src/device/usbd_auto_desc.c
@@ -101,18 +101,19 @@ enum
   ITF_NUM_TOTAL
 };
 
-enum {
-    ITF_STR_LANGUAGE = 0 ,
-    ITF_STR_MANUFACTURER ,
-    ITF_STR_PRODUCT      ,
-    ITF_STR_SERIAL       ,
+enum
+{
+  ITF_STR_LANGUAGE = 0 ,
+  ITF_STR_MANUFACTURER ,
+  ITF_STR_PRODUCT      ,
+  ITF_STR_SERIAL       ,
 
 #if CFG_TUD_CDC
-    ITF_STR_CDC          ,
+  ITF_STR_CDC          ,
 #endif
 
 #if CFG_TUD_MSC
-    ITF_STR_MSC          ,
+  ITF_STR_MSC          ,
 #endif
 
 #if CFG_TUD_HID_KEYBOARD && CFG_TUD_HID_KEYBOARD_BOOT
@@ -133,23 +134,51 @@ enum {
 #define _EP_OUT(x)              (x)
 
 // CDC
-#define EP_CDC_NOTIF            _EP_IN ( ITF_NUM_CDC+1 )
+#ifdef CFG_TUD_DESC_CDC_EPNUM_NOTIF
+  #define EP_CDC_NOTIF            _EP_IN (CFG_TUD_DESC_CDC_EPNUM_NOTIF)
+#else
+  #define EP_CDC_NOTIF            _EP_IN ( ITF_NUM_CDC+1 )
+#endif
 #define EP_CDC_NOTIF_SIZE       8
 
-#define EP_CDC_OUT              _EP_OUT( ITF_NUM_CDC+2 )
-#define EP_CDC_IN               _EP_IN ( ITF_NUM_CDC+2 )
+#ifdef CFG_TUD_DESC_CDC_EPNUM
+  #define EP_CDC_OUT              _EP_OUT( CFG_TUD_DESC_CDC_EPNUM )
+  #define EP_CDC_IN               _EP_IN ( CFG_TUD_DESC_CDC_EPNUM )
+#else
+  #define EP_CDC_OUT              _EP_OUT( ITF_NUM_CDC+2 )
+  #define EP_CDC_IN               _EP_IN ( ITF_NUM_CDC+2 )
+#endif
 
 // Mass Storage
-#define EP_MSC_OUT              _EP_OUT( ITF_NUM_MSC+1 )
-#define EP_MSC_IN               _EP_IN ( ITF_NUM_MSC+1 )
+#ifdef CFG_TUD_DESC_MSC_EPNUM
+  #define EP_MSC_OUT              _EP_OUT( CFG_TUD_DESC_MSC_EPNUM )
+  #define EP_MSC_IN               _EP_IN ( CFG_TUD_DESC_MSC_EPNUM )
+#else
+  #define EP_MSC_OUT              _EP_OUT( ITF_NUM_MSC+1 )
+  #define EP_MSC_IN               _EP_IN ( ITF_NUM_MSC+1 )
+#endif
+
+#if TUD_OPT_HIGH_SPEED
+#define EP_MSC_SIZE 512
+#else
+#define EP_MSC_SIZE 64
+#endif
 
 
 // HID Keyboard with boot protocol
-#define EP_HID_KBD_BOOT         _EP_IN ( ITF_NUM_HID_BOOT_KBD+1 )
+#ifdef CFG_TUD_DESC_HID_KEYBOARD_EPNUM
+  #define EP_HID_KBD_BOOT         _EP_IN ( CFG_TUD_DESC_HID_KEYBOARD_EPNUM )
+#else
+  #define EP_HID_KBD_BOOT         _EP_IN ( ITF_NUM_HID_BOOT_KBD+1 )
+#endif
 #define EP_HID_KBD_BOOT_SZ      8
 
 // HID Mouse with boot protocol
-#define EP_HID_MSE_BOOT         _EP_IN ( ITF_NUM_HID_BOOT_MSE+1 )
+#ifdef CFG_TUD_DESC_HID_MOUSE_EPNUM
+  #define EP_HID_MSE_BOOT         _EP_IN ( CFG_TUD_DESC_HID_MOUSE_EPNUM )
+#else
+  #define EP_HID_MSE_BOOT         _EP_IN ( ITF_NUM_HID_BOOT_MSE+1 )
+#endif
 #define EP_HID_MSE_BOOT_SZ      8
 
 // HID composite = keyboard + mouse + gamepad + etc ...
@@ -466,7 +495,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
           .bDescriptorType  = TUSB_DESC_ENDPOINT,
           .bEndpointAddress = EP_MSC_OUT,
           .bmAttributes     = { .xfer = TUSB_XFER_BULK },
-          .wMaxPacketSize   = { .size = CFG_TUD_MSC_EPSIZE},
+          .wMaxPacketSize   = { .size = EP_MSC_SIZE},
           .bInterval        = 1
       },
 
@@ -476,7 +505,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
           .bDescriptorType  = TUSB_DESC_ENDPOINT,
           .bEndpointAddress = EP_MSC_IN,
           .bmAttributes     = { .xfer = TUSB_XFER_BULK },
-          .wMaxPacketSize   = { .size = CFG_TUD_MSC_EPSIZE},
+          .wMaxPacketSize   = { .size = EP_MSC_SIZE},
           .bInterval        = 1
       }
     },
@@ -563,7 +592,6 @@ desc_auto_cfg_t const _desc_auto_config_struct =
 #endif // boot mouse
 
 #if AUTO_DESC_HID_GENERIC
-
     //------------- HID Generic Multiple report -------------//
     .hid_generic =
     {
@@ -601,7 +629,6 @@ desc_auto_cfg_t const _desc_auto_config_struct =
             .bInterval        = 0x0A
         }
     }
-
 #endif // hid generic
 };
 
diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 31d74edf0..ebeaaaa4d 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -68,6 +68,7 @@ CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDOINT0_
 

 void usbd_control_reset (uint8_t rhport)

 {

+  (void) rhport;

   tu_varclr(&_control_state);

 }

 

@@ -126,8 +127,11 @@ bool usbd_control_xfer(uint8_t rhport, tusb_control_request_t const * request, v
 }

 

 // callback when a transaction complete on DATA stage of control endpoint

-bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)

+bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes)

 {

+  (void) result;

+  (void) ep_addr;

+

   if ( _control_state.request.bmRequestType_bit.direction == TUSB_DIR_OUT )

   {

     memcpy(_control_state.buffer, _usbd_ctrl_buf, xferred_bytes);