<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12609">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove OCTSIM in USB ID<br><br>this bootloader is initiated and meant for the sysmo-OCTSIM, but<br>it can be applied for other SAM E5x/D5x boards.<br>Thus we remove the OCTSIM name an just use the more generic<br>bootloader name.<br><br>Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14<br>---<br>M config/usbd_config.h<br>M usb/class/dfu/device/dfudf_desc.h<br>2 files changed, 31 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/09/12609/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/config/usbd_config.h b/config/usbd_config.h</span><br><span>index 96b3320..c20dfb2 100644</span><br><span>--- a/config/usbd_config.h</span><br><span>+++ b/config/usbd_config.h</span><br><span>@@ -23,7 +23,7 @@</span><br><span> #endif</span><br><span> // <s> Language IDs</span><br><span> // <i> Language IDs in c format, split by comma (E.g., 0x0409 ...)</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_langid</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_langid</span><br><span> #ifndef CONF_USB_DFUD_LANGID</span><br><span> #define CONF_USB_DFUD_LANGID "0x0409"</span><br><span> #endif</span><br><span>@@ -69,33 +69,33 @@</span><br><span> // <0x0010=> 16 bytes</span><br><span> // <0x0020=> 32 bytes</span><br><span> // <0x0040=> 64 bytes</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bmaxpksz0</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bmaxpksz0</span><br><span> #ifndef CONF_USB_DFUD_BMAXPKSZ0</span><br><span> #define CONF_USB_DFUD_BMAXPKSZ0 0x40</span><br><span> #endif</span><br><span> </span><br><span> // <o> idVendor <0x0000-0xFFFF></span><br><span> // <0x1d50=> OpenMoko</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_octsim_idvendor</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef CONF_USB_OCTSIM_IDVENDOR</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_OCTSIM_IDVENDOR 0x1d50</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_idvendor</span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef CONF_USB_OPENMOKO_IDVENDOR</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_OPENMOKO_IDVENDOR 0x1d50</span><br><span> #endif</span><br><span> </span><br><span> // <o> idProduct <0x0000-0xFFFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <0x6140=> sysmoOCTSIM</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_idproduct</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef CONF_USB_OCTSIM_IDPRODUCT</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_OCTSIM_IDPRODUCT 0x6140</span><br><span style="color: hsl(120, 100%, 40%);">+// <0x6140=> osmo-ASF4-DFU</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_idproduct</span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef CONF_USB_OSMOASF4DFU_IDPRODUCT</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_OSMOASF4DFU_IDPRODUCT 0x6140</span><br><span> #endif</span><br><span> </span><br><span> // <o> bcdDevice <0x0000-0xFFFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bcddevice</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bcddevice</span><br><span> #ifndef CONF_USB_DFUD_BCDDEVICE</span><br><span> #define CONF_USB_DFUD_BCDDEVICE 0x000</span><br><span> #endif</span><br><span> </span><br><span> // <e> Enable string descriptor of iManufact</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_imanufact_en</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_imanufact_en</span><br><span> #ifndef CONF_USB_DFUD_IMANUFACT_EN</span><br><span> #define CONF_USB_DFUD_IMANUFACT_EN 1</span><br><span> #endif</span><br><span>@@ -105,7 +105,7 @@</span><br><span> #endif</span><br><span> </span><br><span> // <s> Unicode string of iManufact</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_imanufact_str</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_imanufact_str</span><br><span> #ifndef CONF_USB_DFUD_IMANUFACT_STR</span><br><span> #define CONF_USB_DFUD_IMANUFACT_STR "osmocom"</span><br><span> #endif</span><br><span>@@ -117,7 +117,7 @@</span><br><span> // </e></span><br><span> </span><br><span> // <e> Enable string descriptor of iProduct</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iproduct_en</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iproduct_en</span><br><span> #ifndef CONF_USB_DFUD_IPRODUCT_EN</span><br><span> #define CONF_USB_DFUD_IPRODUCT_EN 1</span><br><span> #endif</span><br><span>@@ -128,7 +128,7 @@</span><br><span> #endif</span><br><span> </span><br><span> // <s> Unicode string of iProduct</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iproduct_str</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iproduct_str</span><br><span> #ifndef CONF_USB_DFUD_IPRODUCT_STR</span><br><span> #define CONF_USB_DFUD_IPRODUCT_STR "osmo-ASF4-DFU"</span><br><span> #endif</span><br><span>@@ -140,7 +140,7 @@</span><br><span> // </e></span><br><span> </span><br><span> // <e> Enable string descriptor of iSerialNum</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iserialnum_en</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iserialnum_en</span><br><span> #ifndef CONF_USB_DFUD_ISERIALNUM_EN</span><br><span> #define CONF_USB_DFUD_ISERIALNUM_EN 0</span><br><span> #endif</span><br><span>@@ -152,7 +152,7 @@</span><br><span> #endif</span><br><span> </span><br><span> // <s> Unicode string of iSerialNum</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iserialnum_str</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iserialnum_str</span><br><span> #ifndef CONF_USB_DFUD_ISERIALNUM_STR</span><br><span> #define CONF_USB_DFUD_ISERIALNUM_STR "123456789ABCDEF"</span><br><span> #endif</span><br><span>@@ -164,7 +164,7 @@</span><br><span> // </e></span><br><span> </span><br><span> // <o> bNumConfigurations <0x01-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bnumconfig</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bnumconfig</span><br><span> #ifndef CONF_USB_DFUD_BNUMCONFIG</span><br><span> #define CONF_USB_DFUD_BNUMCONFIG 0x1</span><br><span> #endif</span><br><span>@@ -174,25 +174,25 @@</span><br><span> // <h> DFU Configuration Descriptor</span><br><span> </span><br><span> // <o> wTotalLength <0x01-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_wtotallength</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_wtotallength</span><br><span> #ifndef CONF_USB_DFUD_WTOTALLENGTH</span><br><span> #define CONF_USB_DFUD_WTOTALLENGTH 27</span><br><span> #endif</span><br><span> </span><br><span> // <o> bNumInterfaces <0x01-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bnuminterfaces</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bnuminterfaces</span><br><span> #ifndef CONF_USB_DFUD_BNUMINTERFACES</span><br><span> #define CONF_USB_DFUD_BNUMINTERFACES 1</span><br><span> #endif</span><br><span> </span><br><span> // <o> bConfigurationValue <0x01-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bconfigval</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bconfigval</span><br><span> #ifndef CONF_USB_DFUD_BCONFIGVAL</span><br><span> #define CONF_USB_DFUD_BCONFIGVAL 0x1</span><br><span> #endif</span><br><span> </span><br><span> // <e> Enable string descriptor of iConfig</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iconfig_en</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iconfig_en</span><br><span> #ifndef CONF_USB_DFUD_ICONFIG_EN</span><br><span> #define CONF_USB_DFUD_ICONFIG_EN 0</span><br><span> #endif</span><br><span>@@ -205,7 +205,7 @@</span><br><span> #endif</span><br><span> </span><br><span> // <s> Unicode string of iConfig</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iconfig_str</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iconfig_str</span><br><span> #ifndef CONF_USB_DFUD_ICONFIG_STR</span><br><span> #define CONF_USB_DFUD_ICONFIG_STR ""</span><br><span> #endif</span><br><span>@@ -221,13 +221,13 @@</span><br><span> // <0xA0=> Bus power supply, support for remote wakeup</span><br><span> // <0xC0=> Self powered, not support for remote wakeup</span><br><span> // <0xE0=> Self powered, support for remote wakeup</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bmattri</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bmattri</span><br><span> #ifndef CONF_USB_DFUD_BMATTRI</span><br><span> #define CONF_USB_DFUD_BMATTRI 0x80</span><br><span> #endif</span><br><span> </span><br><span> // <o> bMaxPower <0x00-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bmaxpower</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bmaxpower</span><br><span> #ifndef CONF_USB_DFUD_BMAXPOWER</span><br><span> #define CONF_USB_DFUD_BMAXPOWER 0x32</span><br><span> #endif</span><br><span>@@ -236,25 +236,25 @@</span><br><span> // <h> DFU Interface Descriptor</span><br><span> </span><br><span> // <o> bInterfaceNumber <0x00-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bifcnum</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bifcnum</span><br><span> #ifndef CONF_USB_DFUD_BIFCNUM</span><br><span> #define CONF_USB_DFUD_BIFCNUM 0x0</span><br><span> #endif</span><br><span> </span><br><span> // <o> bAlternateSetting <0x00-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_baltset</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_baltset</span><br><span> #ifndef CONF_USB_DFUD_BALTSET</span><br><span> #define CONF_USB_DFUD_BALTSET 0x0</span><br><span> #endif</span><br><span> </span><br><span> // <o> bNumEndpoints <0x00-0xFF></span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_bnumep</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_bnumep</span><br><span> #ifndef CONF_USB_DFUD_BNUMEP</span><br><span> #define CONF_USB_DFUD_BNUMEP 0x0</span><br><span> #endif</span><br><span> </span><br><span> // <e> Enable string descriptor of iInterface</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iinterface_en</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iinterface_en</span><br><span> #ifndef CONF_USB_DFUD_IINTERFACE_EN</span><br><span> #define CONF_USB_DFUD_IINTERFACE_EN 1</span><br><span> #endif</span><br><span>@@ -267,7 +267,7 @@</span><br><span> #endif</span><br><span> </span><br><span> // <s> Unicode string of iInterface</span><br><span style="color: hsl(0, 100%, 40%);">-// <id> usb_dufd_iinterface_str</span><br><span style="color: hsl(120, 100%, 40%);">+// <id> usb_dfud_iinterface_str</span><br><span> #ifndef CONF_USB_DFUD_IINTERFAGE_STR</span><br><span> #define CONF_USB_DFUD_IINTERFACE_STR "SAM D5x/E5x DFU bootloader (DFU mode)"</span><br><span> #endif</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 68880c7..97bff4c 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>@@ -44,8 +44,8 @@</span><br><span> CONF_USB_DFUD_BDEVICESUBCLASS, \</span><br><span> CONF_USB_DFUD_BDEVICEPROTOCOL, \</span><br><span> CONF_USB_DFUD_BMAXPKSZ0, \</span><br><span style="color: hsl(0, 100%, 40%);">- CONF_USB_OCTSIM_IDVENDOR, \</span><br><span style="color: hsl(0, 100%, 40%);">- CONF_USB_OCTSIM_IDPRODUCT, \</span><br><span style="color: hsl(120, 100%, 40%);">+ CONF_USB_OPENMOKO_IDVENDOR, \</span><br><span style="color: hsl(120, 100%, 40%);">+ CONF_USB_OSMOASF4DFU_IDPRODUCT, \</span><br><span> CONF_USB_DFUD_BCDDEVICE, \</span><br><span> CONF_USB_DFUD_IMANUFACT, \</span><br><span> CONF_USB_DFUD_IPRODUCT, \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12609">change 12609</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/12609"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Icc46f0d8b4b649fd00b5c6cea5bad91a93891f14 </div>
<div style="display:none"> Gerrit-Change-Number: 12609 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>