Change in osmo-asf4-dfu[master]: add initial DFU class request handling
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12500 )
Change subject: add initial DFU class request handling
..
add initial DFU class request handling
downloading is not supported yet, but the rest works
Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf
---
M usb/class/dfu/device/dfudf.c
1 file changed, 49 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c
index faf12c1..f3286a1 100644
--- a/usb/class/dfu/device/dfudf.c
+++ b/usb/class/dfu/device/dfudf.c
@@ -34,6 +34,9 @@
static struct usbdf_driver _dfudf;
static struct dfudf_func_data _dfudf_funcd;
+static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU
state */
+static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU
status */
+
/**
* \brief Enable DFU Function
* \param[in] drv Pointer to USB device function driver
@@ -137,15 +140,55 @@
if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request
return ERR_NOT_FOUND;
}
+
+ int32_t to_return = ERR_NONE;
+ uint8_t response[6]; // buffer for the response to this request
if ((req->wIndex == _dfudf_funcd.func_iface)) {
// we don't verify the bmRequestType
switch (req->bRequest) {
- default:
- return ERR_UNSUPPORTED_OP;
+ case USB_DFU_GETSTATUS: // get status
+ response[0] = dfu_status; // set status
+ response[1] = 100; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[2] = 0; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[3] = 0; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[4] = dfu_state; // set state
+ response[5] = 0; // string not used
+ to_return = usbdc_xfer(ep, response, 6, false); // send
back status
+ if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) {
+ dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch
to busy state
+ } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC ==
dfu_state) {
+ dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go
to manifest mode
+ dfu_state = USB_DFU_STATE_APP_DETACH;
+ }
+ break;
+ case USB_DFU_CLRSTATUS: // clear status
+ if (USB_DFU_STATE_DFU_ERROR == dfu_state ||
USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error
+ dfu_status = USB_DFU_STATUS_OK; // clear error
status
+ dfu_state = USB_DFU_STATE_DFU_IDLE; // put back
in idle state
+ }
+ to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK
+ break;
+ case USB_DFU_GETSTATE: // get state
+ response[0] = dfu_state; // return state
+ to_return = usbdc_xfer(ep, response, 1, false); // send
back state
+ break;
+ case USB_DFU_ABORT: // abort current operation
+ dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle
state (nothing else to do)
+ to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK
+ //flash_pointer = (uint32_t)&__application_beginning;
// reset download location
+ break;
+ case USB_DFU_DETACH: // detach makes only sense in DFU
run-time/application mode
+ case USB_DFU_UPLOAD: // upload firmware from flash not supported
+ case USB_DFU_DNLOAD: // download firmware on flash TODO
implement
+ default: // all other DFU class request
+ dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or
unsupported class request
+ to_return = ERR_UNSUPPORTED_OP; // stall control pipe
(don't reply to the request)
+ break;
}
} else {
- return ERR_NOT_FOUND;
+ to_return = ERR_NOT_FOUND;
}
+ return to_return;
}
/** USB Device DFU Handler Struct */
@@ -165,11 +208,13 @@
usbdc_register_function(&_dfudf);
usbdc_register_handler(USBDC_HDL_REQ, _req_h);
+
+ // TODO check if firmware is corrupted and set dfuERROR state if it is
return ERR_NONE;
}
/**
- * \brief Deinitialize the USB DFU Function Driver
+ * \brief De-initialize the USB DFU Function Driver
*/
Change in osmo-asf4-dfu[master]: add initial DFU class request handling
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12500 ) Change subject: add initial DFU class request handling .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf Gerrit-Change-Number: 12500 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 11 Jan 2019 17:12:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-asf4-dfu[master]: add initial DFU class request handling
Kévin Redon has uploaded this change for review. (
https://gerrit.osmocom.org/12500
Change subject: add initial DFU class request handling
..
add initial DFU class request handling
downloading is not supported yet, but the rest works
Change-Id: I4896d73602bb1b1001c1ce3af9b98e5173b45edf
---
M usb/class/dfu/device/dfudf.c
1 file changed, 49 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/00/12500/1
diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c
index a146024..c58d101 100644
--- a/usb/class/dfu/device/dfudf.c
+++ b/usb/class/dfu/device/dfudf.c
@@ -46,6 +46,9 @@
static struct usbdf_driver _dfudf;
static struct dfudf_func_data _dfudf_funcd;
+static enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE; /**< current DFU
state */
+static enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK; /**< current DFU
status */
+
/**
* \brief Enable DFU Function
* \param[in] drv Pointer to USB device function driver
@@ -149,15 +152,55 @@
if (0x01 != ((req->bmRequestType >> 5) & 0x03)) { // class request
return ERR_NOT_FOUND;
}
+
+ int32_t to_return = ERR_NONE;
+ uint8_t response[6]; // buffer for the response to this request
if ((req->wIndex == _dfudf_funcd.func_iface)) {
// we don't verify the bmRequestType
switch (req->bRequest) {
- default:
- return ERR_UNSUPPORTED_OP;
+ case USB_DFU_GETSTATUS: // get status
+ response[0] = dfu_status; // set status
+ response[1] = 100; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[2] = 0; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[3] = 0; // set poll timeout (24 bits, in
milliseconds) to small value for periodical poll
+ response[4] = dfu_state; // set state
+ response[5] = 0; // string not used
+ to_return = usbdc_xfer(ep, response, 6, false); // send
back status
+ if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state) {
+ dfu_state = USB_DFU_STATE_DFU_DNBUSY; // switch
to busy state
+ } else if (USB_DFU_STATE_DFU_MANIFEST_SYNC ==
dfu_state) {
+ dfu_state = USB_DFU_STATE_DFU_MANIFEST; // go
to manifest mode
+ dfu_state = USB_DFU_STATE_APP_DETACH;
+ }
+ break;
+ case USB_DFU_CLRSTATUS: // clear status
+ if (USB_DFU_STATE_DFU_ERROR == dfu_state ||
USB_DFU_STATUS_OK != dfu_status) { // only clear in case there is an error
+ dfu_status = USB_DFU_STATUS_OK; // clear error
status
+ dfu_state = USB_DFU_STATE_DFU_IDLE; // put back
in idle state
+ }
+ to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK
+ break;
+ case USB_DFU_GETSTATE: // get state
+ response[0] = dfu_state; // return state
+ to_return = usbdc_xfer(ep, response, 1, false); // send
back state
+ break;
+ case USB_DFU_ABORT: // abort current operation
+ dfu_state = USB_DFU_STATE_DFU_IDLE; // put back in idle
state (nothing else to do)
+ to_return = usbdc_xfer(ep, NULL, 0, true); // send ACK
+ //flash_pointer = (uint32_t)&__application_beginning;
// reset download location
+ break;
+ case USB_DFU_DETACH: // detach makes only sense in DFU
run-time/application mode
+ case USB_DFU_UPLOAD: // upload firmware from flash not supported
+ case USB_DFU_DNLOAD: // download firmware on flash TODO
implement
+ default: // all other DFU class request
+ dfu_state = USB_DFU_STATE_DFU_ERROR; // unknown or
unsupported class request
+ to_return = ERR_UNSUPPORTED_OP; // stall control pipe
(don't reply to the request)
+ break;
}
} else {
- return ERR_NOT_FOUND;
+ to_return = ERR_NOT_FOUND;
}
+ return to_return;
}
/** USB Device DFU Handler Struct */
@@ -177,11 +220,13 @@
usbdc_register_function(&_dfudf);
usbdc_register_handler(USBDC_HDL_REQ, _req_h);
+
+ // TODO check if firmware is corrupted and set dfuERROR state if it is
return ERR_NONE;
}
/**
- * \brief Deinitialize the USB DFU Function Driver
+ * \brief De-initialize the USB DFU Function Driver
*/
void
