<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">change iManufacturer to full sysmocom company name<br><br>... like in USB descriptors of other products<br><br>Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d<br>---<br>M sysmoOCTSIM/atmel_start_config.atstart<br>M sysmoOCTSIM/config/usbd_config.h<br>M sysmoOCTSIM/usb_descriptors.c<br>M sysmoOCTSIM/usb_descriptors.h<br>4 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/20/16520/1</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 926fe33..73ad9bd 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>+++ b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>@@ -69,7 +69,7 @@</span><br><span>       usb_cdcd_acm_idproduct: 24897</span><br><span>       usb_cdcd_acm_idvender: 7504</span><br><span>       usb_cdcd_acm_imanufact_en: true</span><br><span style="color: hsl(0, 100%, 40%);">-      usb_cdcd_acm_imanufact_str: sysmocom</span><br><span style="color: hsl(120, 100%, 40%);">+      usb_cdcd_acm_imanufact_str: sysmocom - s.f.m.c. GmbH</span><br><span>       usb_cdcd_acm_iproduct_en: true</span><br><span>       usb_cdcd_acm_iproduct_str: sysmoOCTSIM</span><br><span>       usb_cdcd_acm_iserialnum_en: false</span><br><span>diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h</span><br><span>index a8861dd..b44d14c 100644</span><br><span>--- a/sysmoOCTSIM/config/usbd_config.h</span><br><span>+++ b/sysmoOCTSIM/config/usbd_config.h</span><br><span>@@ -84,12 +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 "sysmocom"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH"</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(0, 100%, 40%);">-  18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \</span><br><span style="color: hsl(120, 100%, 40%);">+                                             's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0,</span><br><span> #endif</span><br><span> </span><br><span> // </e></span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c</span><br><span>index beb1633..2b41390 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.c</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.c</span><br><span>@@ -212,7 +212,7 @@</span><br><span>          CDCD_ACM_STR_DESCES</span><br><span> #else</span><br><span>                  4,  3, 0x09, 0x04,</span><br><span style="color: hsl(0, 100%, 40%);">-             18,  3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0,</span><br><span style="color: hsl(120, 100%, 40%);">+               50,  3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0,</span><br><span>              24,  3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'O',0, 'C',0, 'T',0, 'S',0, 'I',0, 'M',0,</span><br><span>                  4,  3, 'A', 0,</span><br><span>              22,  3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0,</span><br><span>diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h</span><br><span>index 94a4212..adf6405 100644</span><br><span>--- a/sysmoOCTSIM/usb_descriptors.h</span><br><span>+++ b/sysmoOCTSIM/usb_descriptors.h</span><br><span>@@ -61,7 +61,7 @@</span><br><span>           struct usb_ccid_class_descriptor class;</span><br><span>              struct usb_ep_desc ep[3];</span><br><span>    } ccid;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t str[116];</span><br><span style="color: hsl(120, 100%, 40%);">+     uint8_t str[148];</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> #endif /* USB_DESCRIPTORS_H_ */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520">change 16520</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/c/osmo-ccid-firmware/+/16520"/><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-Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d </div>
<div style="display:none"> Gerrit-Change-Number: 16520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>