Change in osmo-asf4-dfu[master]: add documentation and fix timeout value

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Jan 17 12:08:15 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12499 )

Change subject: add documentation and fix timeout value
......................................................................

add documentation and fix timeout value

Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8
---
M usb/class/dfu/device/dfudf_desc.h
M usb/class/dfu/usb_protocol_dfu.h
2 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h
index f9eca38..5590e16 100644
--- a/usb/class/dfu/device/dfudf_desc.h
+++ b/usb/class/dfu/device/dfudf_desc.h
@@ -84,9 +84,9 @@
 	                     USB_DFU_PROTOCOL_DFU, \
 	                     CONF_USB_DFUD_IINTERFACE), \
 	                     USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \
-	                     	                     200, /* maximum time in milliseconds to detach (and reboot) */ \
-	                     	                     1024, /* maximum transfer size */ \
-	                     	                     0x0110 /*< DFU specification version 1.1 used */ )
+	                     	                     0, /**< detaching makes only sense in run-time mode */ \
+	                     	                     1024, /**< transfer size corresponds to page size for optimal flash writing */ \
+	                     	                     0x0110 /**< DFU specification version 1.1 used */ )
 
 #define DFUD_STR_DESCES \
 	CONF_USB_DFUD_LANGID_DESC \
diff --git a/usb/class/dfu/usb_protocol_dfu.h b/usb/class/dfu/usb_protocol_dfu.h
index 2e7323f..7f82743 100644
--- a/usb/class/dfu/usb_protocol_dfu.h
+++ b/usb/class/dfu/usb_protocol_dfu.h
@@ -79,15 +79,15 @@
 
 //! DFU Functional Descriptor
 typedef struct usb_dfu_func_desc {
-	uint8_t bFunctionLength;
-	uint8_t bDescriptorType;
-	uint8_t bmAttributes;
-	le16_t  wDetachTimeOut;
-	le16_t  wTransferSize;
-	le16_t  bcdDFUVersion;
+	uint8_t bFunctionLength; /**< Size of this descriptor, in bytes (always 9) */
+	uint8_t bDescriptorType; /**< DFU FUNCTIONAL descriptor type (always 0x21) */
+	uint8_t bmAttributes; /**< DFU attributes bit mask */
+	le16_t  wDetachTimeOut; /**< Time, in milliseconds, that the device will wait after receipt of the DFU_DETACH request */
+	le16_t  wTransferSize; /**< Maximum number of bytes that the device can accept per control-write transaction */
+	le16_t  bcdDFUVersion; /**< Numeric expression identifying the version of the DFU Specification release */
 } usb_dfu_func_desc_t;
 
-#define USB_DFU_FUNC_DESC_LEN 0x09
+#define USB_DFU_FUNC_DESC_LEN 9
 #define USB_DFU_FUNC_DESC_TYPE 0x21
 #define USB_DFU_FUNC_DESC_BYTES(bmAttributes, wDetachTimeOut, wTransferSize, bcdDFUVersion) \
 	USB_DFU_FUNC_DESC_LEN, /* bFunctionLength */ \

-- 
To view, visit https://gerrit.osmocom.org/12499
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1d6ef4e4a5c9929aefd149c4e3eaf2dfe37fea8
Gerrit-Change-Number: 12499
Gerrit-PatchSet: 3
Gerrit-Owner: Kévin Redon <kredon at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190117/12fcd614/attachment.htm>


More information about the gerrit-log mailing list