<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12506">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make USB descriptor available for the two state machines<br><br>this is required to know the DFU bmAttributes since they affect<br>the state machine<br><br>Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e<br>---<br>M usb/class/dfu/device/dfudf.c<br>M usb/class/dfu/device/dfudf_desc.h<br>M usb_start.c<br>3 files changed, 15 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c</span><br><span>index 15a89fc..42b708b 100644</span><br><span>--- a/usb/class/dfu/device/dfudf.c</span><br><span>+++ b/usb/class/dfu/device/dfudf.c</span><br><span>@@ -22,8 +22,9 @@</span><br><span> </span><br><span> #include "dfudf.h"</span><br><span> #include "usb_protocol_dfu.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "dfudf_desc.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** USB Device DFU Fucntion Specific Data */</span><br><span style="color: hsl(120, 100%, 40%);">+/** USB Device DFU Function Specific Data */</span><br><span> struct dfudf_func_data {</span><br><span> /** DFU Interface information */</span><br><span> uint8_t func_iface;</span><br><span>@@ -34,6 +35,10 @@</span><br><span> static struct usbdf_driver _dfudf;</span><br><span> static struct dfudf_func_data _dfudf_funcd;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/** USB DFU functional descriptor (with DFU attributes) */</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB};</span><br><span style="color: hsl(120, 100%, 40%);">+static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum usb_dfu_state dfu_state = USB_DFU_STATE_DFU_IDLE;</span><br><span> enum usb_dfu_status dfu_status = USB_DFU_STATUS_OK;</span><br><span> </span><br><span>diff --git a/usb/class/dfu/device/dfudf_desc.h b/usb/class/dfu/device/dfudf_desc.h</span><br><span>index 5590e16..cd6ba41 100644</span><br><span>--- a/usb/class/dfu/device/dfudf_desc.h</span><br><span>+++ b/usb/class/dfu/device/dfudf_desc.h</span><br><span>@@ -75,6 +75,11 @@</span><br><span> CONF_USB_DFUD_BMATTRI, \</span><br><span> CONF_USB_DFUD_BMAXPOWER)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define DFUD_IFACE_DESCB USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, /**< detaching makes only sense in run-time mode */ \</span><br><span style="color: hsl(120, 100%, 40%);">+ 512, /**< transfer size corresponds to page size for optimal flash writing */ \</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x0110 /**< DFU specification version 1.1 used */ )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define DFUD_IFACE_DESCES \</span><br><span> USB_IFACE_DESC_BYTES(CONF_USB_DFUD_BIFCNUM, \</span><br><span> CONF_USB_DFUD_BALTSET, \</span><br><span>@@ -83,10 +88,7 @@</span><br><span> USB_DFU_SUBCLASS, \</span><br><span> USB_DFU_PROTOCOL_DFU, \</span><br><span> CONF_USB_DFUD_IINTERFACE), \</span><br><span style="color: hsl(0, 100%, 40%);">- USB_DFU_FUNC_DESC_BYTES(USB_DFU_ATTRIBUTES_CAN_DOWNLOAD | USB_DFU_ATTRIBUTES_WILL_DETACH, \</span><br><span style="color: hsl(0, 100%, 40%);">- 0, /**< detaching makes only sense in run-time mode */ \</span><br><span style="color: hsl(0, 100%, 40%);">- 1024, /**< transfer size corresponds to page size for optimal flash writing */ \</span><br><span style="color: hsl(0, 100%, 40%);">- 0x0110 /**< DFU specification version 1.1 used */ )</span><br><span style="color: hsl(120, 100%, 40%);">+ DFUD_IFACE_DESCB</span><br><span> </span><br><span> #define DFUD_STR_DESCES \</span><br><span> CONF_USB_DFUD_LANGID_DESC \</span><br><span>diff --git a/usb_start.c b/usb_start.c</span><br><span>index 4f9f875..d911db4 100644</span><br><span>--- a/usb_start.c</span><br><span>+++ b/usb_start.c</span><br><span>@@ -39,6 +39,9 @@</span><br><span> #endif</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/** USB DFU functional descriptor (with DFU attributes) */</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t usb_dfu_func_desc_bytes[] = {DFUD_IFACE_DESCB};</span><br><span style="color: hsl(120, 100%, 40%);">+static const usb_dfu_func_desc_t* usb_dfu_func_desc = (usb_dfu_func_desc_t*)&usb_dfu_func_desc_bytes;</span><br><span> /** Ctrl endpoint buffer */</span><br><span> static uint8_t ctrl_buffer[64];</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12506">change 12506</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12506"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-asf4-dfu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib3907423bb9e197f53ed4522e8a5789a3d29489e </div>
<div style="display:none"> Gerrit-Change-Number: 12506 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>