Split out the control endpoint logic

6 files changed, 32 insertions, 32 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index f3d4622f8..81d7fa526 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -45,6 +45,7 @@
 // INCLUDE

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

 #include "cdc_device.h"

+#include "device/control.h"

 #include "device/usbd_pvt.h"

 

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

@@ -287,7 +288,7 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

+tusb_error_t cdcd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent)

 {

   //------------- Class Specific Request -------------//

   if (p_request->bmRequestType_bit.type != TUSB_REQ_TYPE_CLASS) return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT;

@@ -299,7 +300,7 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   if ( (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest) || (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest) )

   {

     uint16_t len = tu_min16(sizeof(cdc_line_coding_t), p_request->wLength);

-    usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) &p_cdc->line_coding, len);

+    dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, (uint8_t*) &p_cdc->line_coding, len);

 

     // Invoke callback

     if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest)

@@ -309,8 +310,6 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   }

   else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest )

   {

-    dcd_control_status(rhport, p_request->bmRequestType_bit.direction); // ACK control request

-

     // CDC PSTN v1.2 section 6.3.12

     // Bit 0: Indicates if DTE is present or not.

     //        This signal corresponds to V.24 signal 108/2 and RS-232 signal DTR (Data Terminal Ready)

@@ -323,7 +322,7 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   }

   else

   {

-    dcd_control_stall(rhport); // stall unsupported request

+    return TUSB_ERROR_FAILED; // stall unsupported request

   }

   return TUSB_ERROR_NONE;

 }

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 2e03793a9..88d37a83c 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -112,7 +112,7 @@ ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_li
 

 void         cdcd_init               (void);

 tusb_error_t cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t cdcd_control_request_st (uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t cdcd_control_request (uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent);

 tusb_error_t cdcd_xfer_cb            (uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void         cdcd_reset              (uint8_t rhport);

 

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 3e74950e6..aa7a8008e 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -46,6 +46,7 @@
 //--------------------------------------------------------------------+

 #include "common/tusb_common.h"

 #include "hid_device.h"

+#include "device/control.h"

 #include "device/usbd_pvt.h"

 

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

@@ -402,7 +403,7 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, u
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

+tusb_error_t hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent)

 {

   hidd_interface_t* p_hid = get_interface_by_itfnum( (uint8_t) p_request->wIndex );

   TU_ASSERT(p_hid, TUSB_ERROR_FAILED);

@@ -416,14 +417,17 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
 

     if (p_request->bRequest == TUSB_REQ_GET_DESCRIPTOR && desc_type == HID_DESC_TYPE_REPORT)

     {

-      // use device control buffer

-      TU_ASSERT ( p_hid->desc_len <= CFG_TUD_CTRL_BUFSIZE );

-      memcpy(_usbd_ctrl_buf, p_hid->desc_report, p_hid->desc_len);

+      // TODO: Handle zero length packet.

+      uint16_t remaining_bytes = p_hid->desc_len - bytes_already_sent;

+      if (remaining_bytes > 64) {

+          remaining_bytes = 64;

+      }

+      memcpy(_shared_control_buffer, p_hid->desc_report + bytes_already_sent, remaining_bytes);

 

-      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, p_hid->desc_len);

+      dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, remaining_bytes);

     }else

     {

-      dcd_control_stall(rhport);

+      return TUSB_ERROR_FAILED;

     }

   }

   //------------- Class Specific Request -------------//

@@ -446,11 +450,11 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
       }

 

       TU_ASSERT( xferlen > 0 );

-      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_hid->report_buf, xferlen);

+      dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, xferlen);

     }

     else if ( HID_REQ_CONTROL_SET_REPORT == p_request->bRequest )

     {

-      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, p_request->wLength);

+      dcd_edpt_xfer(rhport, 0, _shared_control_buffer, p_request->wLength);

 

       // wValue = Report Type | Report ID

       uint8_t const report_type = tu_u16_high(p_request->wValue);

@@ -458,37 +462,35 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
 

       if ( p_hid->set_report_cb )

       {

-        p_hid->set_report_cb(report_id, (hid_report_type_t) report_type, _usbd_ctrl_buf, p_request->wLength);

+        p_hid->set_report_cb(report_id, (hid_report_type_t) report_type, _shared_control_buffer, p_request->wLength);

       }

     }

     else if (HID_REQ_CONTROL_SET_IDLE == p_request->bRequest)

     {

       // TODO idle rate of report

       p_hid->idle_rate = tu_u16_high(p_request->wValue);

-      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }

     else if (HID_REQ_CONTROL_GET_IDLE == p_request->bRequest)

     {

       // TODO idle rate of report

-      _usbd_ctrl_buf[0] = p_hid->idle_rate;

-      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, 1);

+      _shared_control_buffer[0] = p_hid->idle_rate;

+      dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, 1);

     }

     else if (HID_REQ_CONTROL_GET_PROTOCOL == p_request->bRequest )

     {

-      _usbd_ctrl_buf[0] = 1-p_hid->boot_protocol;   // 0 is Boot, 1 is Report protocol

-      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, 1);

+      _shared_control_buffer[0] = 1-p_hid->boot_protocol;   // 0 is Boot, 1 is Report protocol

+      dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, 1);

     }

     else if (HID_REQ_CONTROL_SET_PROTOCOL == p_request->bRequest )

     {

       p_hid->boot_protocol = 1 - p_request->wValue; // 0 is Boot, 1 is Report protocol

-      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }else

     {

-      dcd_control_stall(rhport);

+      return TUSB_ERROR_FAILED;

     }

   }else

   {

-    dcd_control_stall(rhport);

+    return TUSB_ERROR_FAILED;

   }

   return TUSB_ERROR_NONE;

 }

diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index d5b9f3831..10aea10ac 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -378,7 +378,7 @@ ATTR_WEAK void tud_hid_mouse_set_report_cb(uint8_t report_id, hid_report_type_t
 

 void hidd_init(void);

 tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent);

 tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void hidd_reset(uint8_t rhport);

 

@@ -389,5 +389,3 @@ void hidd_reset(uint8_t rhport);
 #endif

 

 #endif /* _TUSB_HID_DEVICE_H_ */

-

-

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index aa9ebbbc9..3c9997b95 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -47,6 +47,7 @@
 

 #include "common/tusb_common.h"

 #include "msc_device.h"

+#include "device/control.h"

 #include "device/usbd_pvt.h"

 

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

@@ -146,22 +147,22 @@ tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf,
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

+tusb_error_t mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent)

 {

   TU_ASSERT(p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS, TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT);

 

   if(MSC_REQ_RESET == p_request->bRequest)

   {

-    dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

+    // TODO: Actually reset.

   }

   else if (MSC_REQ_GET_MAX_LUN == p_request->bRequest)

   {

     // returned MAX LUN is minus 1 by specs

-    _usbd_ctrl_buf[0] = CFG_TUD_MSC_MAXLUN-1;

-    usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, 1);

+    _shared_control_buffer[0] = CFG_TUD_MSC_MAXLUN-1;

+    dcd_edpt_xfer(rhport, TUSB_DIR_IN_MASK, _shared_control_buffer, 1);

   }else

   {

-    dcd_control_stall(rhport); // stall unsupported request

+    return TUSB_ERROR_FAILED; // stall unsupported request

   }

   return TUSB_ERROR_NONE;

 }

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index 92ab4dde0..a5bc54ff9 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -198,7 +198,7 @@ ATTR_WEAK bool tud_lun_capacity_cb(uint8_t lun, uint32_t* last_valid_sector, uin
 

 void mscd_init(void);

 tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request, uint16_t bytes_already_sent);

 tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void mscd_reset(uint8_t rhport);