Removes polltimeout behaviour and restructures

Moves dfu_req_dnload_reply to ACK stage of a DNREQUEST.

Removes unneeded variables due to other simplifications.

2 files changed, 34 insertions, 72 deletions

diff --git a/src/class/dfu/dfu_device.c b/src/class/dfu/dfu_device.c
index 59369a78f..25588aabc 100644
--- a/src/class/dfu/dfu_device.c
+++ b/src/class/dfu/dfu_device.c
@@ -44,10 +44,6 @@ typedef struct TU_ATTR_PACKED
     dfu_state_t state;
     uint8_t attrs;
     bool blk_transfer_in_proc;
-
-    uint8_t itf_num;
-    uint16_t last_block_num;
-    uint16_t last_transfer_len;
     CFG_TUSB_MEM_ALIGN uint8_t transfer_buf[CFG_TUD_DFU_TRANSFER_BUFFER_SIZE];
 } dfu_state_ctx_t;
 
@@ -58,7 +54,7 @@ CFG_TUSB_MEM_SECTION static dfu_state_ctx_t _dfu_state_ctx;
 static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const * request);
 static void dfu_req_getstatus_reply(uint8_t rhport, tusb_control_request_t const * request);
 static uint16_t dfu_req_upload(uint8_t rhport, tusb_control_request_t const * request, uint16_t block_num, uint16_t wLength);
-static void dfu_req_dnload_reply(void);
+static void dfu_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request);
 static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * request);
 
 //--------------------------------------------------------------------+
@@ -148,8 +144,6 @@ void dfu_moded_init(void)
   _dfu_state_ctx.status = DFU_STATUS_OK;
   _dfu_state_ctx.attrs = 0;
   _dfu_state_ctx.blk_transfer_in_proc = false;
-  _dfu_state_ctx.last_block_num = 0;
-  _dfu_state_ctx.last_transfer_len = 0;
 
   dfu_debug_print_context();
 }
@@ -191,8 +185,6 @@ void dfu_moded_reset(uint8_t rhport)
 
   _dfu_state_ctx.status = DFU_STATUS_OK;
   _dfu_state_ctx.blk_transfer_in_proc = false;
-  _dfu_state_ctx.last_block_num = 0;
-  _dfu_state_ctx.last_transfer_len = 0;
   dfu_debug_print_context();
 }
 
@@ -225,23 +217,20 @@ uint16_t dfu_moded_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc,
 // return false to stall control endpoint (e.g unsupported request)
 bool dfu_moded_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request)
 {
-  if ( (stage == CONTROL_STAGE_DATA) && (_dfu_state_ctx.state == DFU_DNLOAD_SYNC) )
-  {
-      dfu_req_dnload_reply();
-      return true;
-  }
-
-  // nothing to do with any other DATA or ACK stage
-  if ( stage != CONTROL_STAGE_SETUP ) return true;
+  // nothing to do with DATA stage
+  if ( stage == CONTROL_STAGE_DATA ) return true;
 
   TU_VERIFY(request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_INTERFACE);
 
-  // dfu-util will try to claim the interface with SET_INTERFACE request before sending DFU request
-  if ( TUSB_REQ_TYPE_STANDARD == request->bmRequestType_bit.type &&
-       TUSB_REQ_SET_INTERFACE == request->bRequest )
+  if(stage == CONTROL_STAGE_SETUP)
   {
-    tud_control_status(rhport, request);
-    return true;
+    // dfu-util will try to claim the interface with SET_INTERFACE request before sending DFU request
+    if ( TUSB_REQ_TYPE_STANDARD == request->bmRequestType_bit.type &&
+         TUSB_REQ_SET_INTERFACE == request->bRequest )
+    {
+      tud_control_status(rhport, request);
+      return true;
+    }
   }
 
   // Handle class request only from here
@@ -249,15 +238,27 @@ bool dfu_moded_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_reque
 
   switch (request->bRequest)
   {
-    case DFU_REQUEST_DETACH:
     case DFU_REQUEST_DNLOAD:
+    {
+      if ( (stage == CONTROL_STAGE_ACK)
+           && ((_dfu_state_ctx.attrs & DFU_FUNC_ATTR_CAN_DOWNLOAD_BITMASK) != 0)
+           && (_dfu_state_ctx.state == DFU_DNLOAD_SYNC))
+      {
+        dfu_req_dnload_reply(rhport, request);
+        return true;
+      }
+    } // fallthrough
+    case DFU_REQUEST_DETACH:
     case DFU_REQUEST_UPLOAD:
     case DFU_REQUEST_GETSTATUS:
     case DFU_REQUEST_CLRSTATUS:
     case DFU_REQUEST_GETSTATE:
     case DFU_REQUEST_ABORT:
     {
-      return dfu_state_machine(rhport, request);
+      if(stage == CONTROL_STAGE_SETUP)
+      {
+        return dfu_state_machine(rhport, request);
+      }
     }
     break;
 
@@ -285,12 +286,7 @@ static void dfu_req_getstatus_reply(uint8_t rhport, tusb_control_request_t const
   dfu_status_req_payload_t resp;
 
   resp.bStatus = _dfu_state_ctx.status;
-  if ( tud_dfu_get_poll_timeout_cb )
-  {
-    tud_dfu_get_poll_timeout_cb((uint8_t *)&resp.bwPollTimeout);
-  } else {
-    memset((uint8_t *)&resp.bwPollTimeout, 0x00, 3);
-  }
+  memset((uint8_t *)&resp.bwPollTimeout, 0x00, 3);
   resp.bState = _dfu_state_ctx.state;
   resp.iString = 0;
 
@@ -304,8 +300,6 @@ static void dfu_req_getstate_reply(uint8_t rhport, tusb_control_request_t const
 
 static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const * request)
 {
-  _dfu_state_ctx.last_block_num = request->wValue;
-  _dfu_state_ctx.last_transfer_len = request->wLength;
   // TODO: add "zero" copy mode so the buffer we read into can be provided by the user
   // if they wish, there still will be the internal control buffer copy to this buffer
   // but this mode would provide zero copy from the class driver to the application
@@ -314,26 +308,14 @@ static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const *
   tud_control_xfer(rhport, request, &_dfu_state_ctx.transfer_buf, request->wLength);
 }
 
-static void dfu_req_dnload_reply(void)
+static void dfu_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request)
 {
-  uint8_t bwPollTimeout[3] = {0,0,0};
-
-  if ( tud_dfu_get_poll_timeout_cb )
-  {
-    tud_dfu_get_poll_timeout_cb((uint8_t *)&bwPollTimeout);
-  }
-
-  tud_dfu_start_poll_timeout_cb((uint8_t *)&bwPollTimeout);
-
-  // TODO: I want the real xferred len, not what is expected.  May need to change usbd.c to do this.
-  tud_dfu_req_dnload_data_cb(_dfu_state_ctx.last_block_num, (uint8_t *)&_dfu_state_ctx.transfer_buf, _dfu_state_ctx.last_transfer_len);
+  (void) rhport;
+  tud_dfu_req_dnload_data_cb(request->wValue, (uint8_t *)&_dfu_state_ctx.transfer_buf, request->wLength);
   _dfu_state_ctx.blk_transfer_in_proc = false;
-
-  _dfu_state_ctx.last_block_num = 0;
-  _dfu_state_ctx.last_transfer_len = 0;
 }
 
-void tud_dfu_poll_timeout_done(void)
+void tud_dfu_dnload_complete(void)
 {
   if (_dfu_state_ctx.state == DFU_DNBUSY)
   {
diff --git a/src/class/dfu/dfu_device.h b/src/class/dfu/dfu_device.h
index d19115555..0c567ff45 100644
--- a/src/class/dfu/dfu_device.h
+++ b/src/class/dfu/dfu_device.h
@@ -45,36 +45,16 @@ bool tud_dfu_firmware_valid_check_cb(void);
 // Invoked when the device must reboot to dfu runtime mode
 void tud_dfu_reboot_to_rt_cb(void);
 
-// Invoked during a DFU_GETSTATUS request to get for the string index
-// to the status description string table.
-TU_ATTR_WEAK uint8_t tud_dfu_get_status_desc_table_index_cb(void);
-
-// Invoked during a DFU_GETSTATUS request to set the timeout in ms to use
-// before the subsequent DFU_GETSTATUS requests.
-// The purpose of this value is to allow the device to tell the host
-// how long to wait between the DFU_DNLOAD and DFU_GETSTATUS checks
-// to allow the device to have time to erase, write memory, etc.
-// ms_timeout is a pointer to array of length 3.
-// Refer to the USB DFU class specification for more details
-TU_ATTR_WEAK void tud_dfu_get_poll_timeout_cb(uint8_t *ms_timeout);
-
-// Invoked when a DFU_DNLOAD request is received
-// This should start a timer for ms_timeout ms
-// When the timer has elapsed, tud_dfu_runtime_poll_timeout_done must be called
-// NOTE: This callback should return immediately, and not implement the delay
-// internally, as this will hold up the class stack from receiving any packets
-// during the DFU_DNLOAD_SYNC and DFU_DNBUSY states
-void tud_dfu_start_poll_timeout_cb(uint8_t *ms_timeout);
-
-// Must be called when the poll_timeout has elapsed
-void tud_dfu_poll_timeout_done(void);
-
 // Invoked when a DFU_DNLOAD request is received
 // This callback takes the wBlockNum chunk of length length and provides it
 // to the application at the data pointer.  This data is only valid for this
 // call, so the app must use it not or copy it.
 void tud_dfu_req_dnload_data_cb(uint16_t wBlockNum, uint8_t* data, uint16_t length);
 
+// Must be called when the application is done using the last block of data
+// provided by tud_dfu_req_dnload_data_cb
+void tud_dfu_dnload_complete(void);
+
 // Invoked during the last DFU_DNLOAD request, signifying that the host believes
 // it is done transmitting data.
 // Return true if the application agrees there is no more data