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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 ) Change subject: change iManufacturer to full sysmocom company name ...................................................................... change iManufacturer to full sysmocom company name ... like in USB descriptors of other products Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/usbd_config.h M sysmoOCTSIM/usb_descriptors.c M sysmoOCTSIM/usb_descriptors.h 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 926fe33..73ad9bd 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -69,7 +69,7 @@ usb_cdcd_acm_idproduct: 24897 usb_cdcd_acm_idvender: 7504 usb_cdcd_acm_imanufact_en: true - usb_cdcd_acm_imanufact_str: sysmocom + usb_cdcd_acm_imanufact_str: sysmocom - s.f.m.c. GmbH usb_cdcd_acm_iproduct_en: true usb_cdcd_acm_iproduct_str: sysmoOCTSIM usb_cdcd_acm_iserialnum_en: false diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h index a8861dd..b44d14c 100644 --- a/sysmoOCTSIM/config/usbd_config.h +++ b/sysmoOCTSIM/config/usbd_config.h @@ -84,12 +84,12 @@ // <s> Unicode string of iManufact // <id> usb_cdcd_acm_imanufact_str #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR -#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom" +#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #endif #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \ - 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#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, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #endif // </e> diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index beb1633..2b41390 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -212,7 +212,7 @@ CDCD_ACM_STR_DESCES #else 4, 3, 0x09, 0x04, - 18, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, + 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, 24, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'O',0, 'C',0, 'T',0, 'S',0, 'I',0, 'M',0, 4, 3, 'A', 0, 22, 3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0, diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index 94a4212..adf6405 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -61,7 +61,7 @@ struct usb_ccid_class_descriptor class; struct usb_ep_desc ep[3]; } ccid; - uint8_t str[116]; + uint8_t str[148]; } __attribute__((packed)); #endif /* USB_DESCRIPTORS_H_ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d Gerrit-Change-Number: 16520 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191206/6a769365/attachment.htm>