<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12794">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;">change USB description to sysmoOCTSIM<br><br>Change-Id: I1f9819df5b4737a9a6dfa69c918d05c60ec5f86a<br>---<br>M sysmoOCTSIM/atmel_start_config.atstart<br>M sysmoOCTSIM/config/usbd_config.h<br>2 files changed, 20 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>index 8a87ba2..f3620ee 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>+++ b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>@@ -68,16 +68,16 @@</span><br><span> usb_cdcd_acm_epaddr: EndpointAddress = 0x82</span><br><span> usb_cdcd_acm_iconfig_en: false</span><br><span> usb_cdcd_acm_iconfig_str: ''</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_idproduct: 9220</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_idvender: 1003</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_imanufact_en: false</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_imanufact_str: Atmel</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_iproduct_en: false</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_iproduct_str: CDC ACM Serial Bridge Demo</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_idproduct: 24897</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_idvender: 7504</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_imanufact_en: true</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_imanufact_str: sysmocom</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_iproduct_en: true</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_iproduct_str: sysmoOCTSIM</span><br><span> usb_cdcd_acm_iserialnum_en: false</span><br><span> usb_cdcd_acm_iserialnum_str: 123456789ABCDEF</span><br><span> usb_cdcd_acm_langid: '0x0409'</span><br><span style="color: hsl(0, 100%, 40%);">- usb_cdcd_acm_str_en: false</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_cdcd_acm_str_en: true</span><br><span> definition: Atmel:USB:0.0.1::USB_Device_CDC_ACM</span><br><span> functionality: USB_Device_CDC_ACM</span><br><span> api: USB:Device:CDC_ACM</span><br><span>diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h</span><br><span>index e8334ec..0be4363 100644</span><br><span>--- a/sysmoOCTSIM/config/usbd_config.h</span><br><span>+++ b/sysmoOCTSIM/config/usbd_config.h</span><br><span>@@ -19,7 +19,7 @@</span><br><span> // <e> Enable String Descriptors</span><br><span> // <id> usb_cdcd_acm_str_en</span><br><span> #ifndef CONF_USB_CDCD_ACM_STR_EN</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_STR_EN 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_STR_EN 1</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>@@ -29,7 +29,7 @@</span><br><span> #endif</span><br><span> </span><br><span> #ifndef CONF_USB_CDCD_ACM_LANGID_DESC</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_LANGID_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_LANGID_DESC 4, 0x03, 0x09, 0x04,</span><br><span> #endif</span><br><span> // </e></span><br><span> </span><br><span>@@ -56,13 +56,13 @@</span><br><span> // <o> idVender <0x0000-0xFFFF></span><br><span> // <id> usb_cdcd_acm_idvender</span><br><span> #ifndef CONF_USB_CDCD_ACM_IDVENDER</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IDVENDER 0x3eb</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IDVENDER 0x1d50</span><br><span> #endif</span><br><span> </span><br><span> // <o> idProduct <0x0000-0xFFFF></span><br><span> // <id> usb_cdcd_acm_idproduct</span><br><span> #ifndef CONF_USB_CDCD_ACM_IDPRODUCT</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IDPRODUCT 0x2404</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IDPRODUCT 0x6141</span><br><span> #endif</span><br><span> </span><br><span> // <o> bcdDevice <0x0000-0xFFFF></span><br><span>@@ -74,7 +74,7 @@</span><br><span> // <e> Enable string descriptor of iManufact</span><br><span> // <id> usb_cdcd_acm_imanufact_en</span><br><span> #ifndef CONF_USB_CDCD_ACM_IMANUFACT_EN</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IMANUFACT_EN 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IMANUFACT_EN 1</span><br><span> #endif</span><br><span> </span><br><span> #ifndef CONF_USB_CDCD_ACM_IMANUFACT</span><br><span>@@ -84,11 +84,12 @@</span><br><span> // <s> Unicode string of iManufact</span><br><span> // <id> usb_cdcd_acm_imanufact_str</span><br><span> #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IMANUFACT_STR "Atmel"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom"</span><br><span> #endif</span><br><span> </span><br><span> #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00,</span><br><span> #endif</span><br><span> </span><br><span> // </e></span><br><span>@@ -96,7 +97,7 @@</span><br><span> // <e> Enable string descriptor of iProduct</span><br><span> // <id> usb_cdcd_acm_iproduct_en</span><br><span> #ifndef CONF_USB_CDCD_ACM_IPRODUCT_EN</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IPRODUCT_EN 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IPRODUCT_EN 1</span><br><span> #endif</span><br><span> </span><br><span> #ifndef CONF_USB_CDCD_ACM_IPRODUCT</span><br><span>@@ -107,11 +108,13 @@</span><br><span> // <s> Unicode string of iProduct</span><br><span> // <id> usb_cdcd_acm_iproduct_str</span><br><span> #ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IPRODUCT_STR "CDC ACM Serial Bridge Demo"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IPRODUCT_STR "sysmoOCTSIM"</span><br><span> #endif</span><br><span> </span><br><span> #ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC \</span><br><span style="color: hsl(120, 100%, 40%);">+ 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', \</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 'M', 0x00,</span><br><span> #endif</span><br><span> </span><br><span> // </e></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12794">change 12794</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/12794"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1f9819df5b4737a9a6dfa69c918d05c60ec5f86a </div>
<div style="display:none"> Gerrit-Change-Number: 12794 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>