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/.
Kévin Redon gerrit-no-reply at lists.osmocom.orgKévin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12794 Change subject: change USB description to sysmoOCTSIM ...................................................................... change USB description to sysmoOCTSIM Change-Id: I1f9819df5b4737a9a6dfa69c918d05c60ec5f86a --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/usbd_config.h 2 files changed, 20 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/94/12794/1 diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 8a87ba2..f3620ee 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -68,16 +68,16 @@ usb_cdcd_acm_epaddr: EndpointAddress = 0x82 usb_cdcd_acm_iconfig_en: false usb_cdcd_acm_iconfig_str: '' - usb_cdcd_acm_idproduct: 9220 - usb_cdcd_acm_idvender: 1003 - usb_cdcd_acm_imanufact_en: false - usb_cdcd_acm_imanufact_str: Atmel - usb_cdcd_acm_iproduct_en: false - usb_cdcd_acm_iproduct_str: CDC ACM Serial Bridge Demo + 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_iproduct_en: true + usb_cdcd_acm_iproduct_str: sysmoOCTSIM usb_cdcd_acm_iserialnum_en: false usb_cdcd_acm_iserialnum_str: 123456789ABCDEF usb_cdcd_acm_langid: '0x0409' - usb_cdcd_acm_str_en: false + usb_cdcd_acm_str_en: true definition: Atmel:USB:0.0.1::USB_Device_CDC_ACM functionality: USB_Device_CDC_ACM api: USB:Device:CDC_ACM diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h index e8334ec..0be4363 100644 --- a/sysmoOCTSIM/config/usbd_config.h +++ b/sysmoOCTSIM/config/usbd_config.h @@ -19,7 +19,7 @@ // <e> Enable String Descriptors // <id> usb_cdcd_acm_str_en #ifndef CONF_USB_CDCD_ACM_STR_EN -#define CONF_USB_CDCD_ACM_STR_EN 0 +#define CONF_USB_CDCD_ACM_STR_EN 1 #endif // <s> Language IDs // <i> Language IDs in c format, split by comma (E.g., 0x0409 ...) @@ -29,7 +29,7 @@ #endif #ifndef CONF_USB_CDCD_ACM_LANGID_DESC -#define CONF_USB_CDCD_ACM_LANGID_DESC +#define CONF_USB_CDCD_ACM_LANGID_DESC 4, 0x03, 0x09, 0x04, #endif // </e> @@ -56,13 +56,13 @@ // <o> idVender <0x0000-0xFFFF> // <id> usb_cdcd_acm_idvender #ifndef CONF_USB_CDCD_ACM_IDVENDER -#define CONF_USB_CDCD_ACM_IDVENDER 0x3eb +#define CONF_USB_CDCD_ACM_IDVENDER 0x1d50 #endif // <o> idProduct <0x0000-0xFFFF> // <id> usb_cdcd_acm_idproduct #ifndef CONF_USB_CDCD_ACM_IDPRODUCT -#define CONF_USB_CDCD_ACM_IDPRODUCT 0x2404 +#define CONF_USB_CDCD_ACM_IDPRODUCT 0x6141 #endif // <o> bcdDevice <0x0000-0xFFFF> @@ -74,7 +74,7 @@ // <e> Enable string descriptor of iManufact // <id> usb_cdcd_acm_imanufact_en #ifndef CONF_USB_CDCD_ACM_IMANUFACT_EN -#define CONF_USB_CDCD_ACM_IMANUFACT_EN 0 +#define CONF_USB_CDCD_ACM_IMANUFACT_EN 1 #endif #ifndef CONF_USB_CDCD_ACM_IMANUFACT @@ -84,11 +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 "Atmel" +#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom" #endif #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define 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, #endif // </e> @@ -96,7 +97,7 @@ // <e> Enable string descriptor of iProduct // <id> usb_cdcd_acm_iproduct_en #ifndef CONF_USB_CDCD_ACM_IPRODUCT_EN -#define CONF_USB_CDCD_ACM_IPRODUCT_EN 0 +#define CONF_USB_CDCD_ACM_IPRODUCT_EN 1 #endif #ifndef CONF_USB_CDCD_ACM_IPRODUCT @@ -107,11 +108,13 @@ // <s> Unicode string of iProduct // <id> usb_cdcd_acm_iproduct_str #ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR -#define CONF_USB_CDCD_ACM_IPRODUCT_STR "CDC ACM Serial Bridge Demo" +#define CONF_USB_CDCD_ACM_IPRODUCT_STR "sysmoOCTSIM" #endif #ifndef CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC -#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC +#define CONF_USB_CDCD_ACM_IPRODUCT_STR_DESC \ + 24, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'O', 0x00, 'C', 0x00, 'T', 0x00, 'S', 0x00, 'I', \ + 0x00, 'M', 0x00, #endif // </e> -- To view, visit https://gerrit.osmocom.org/12794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f9819df5b4737a9a6dfa69c918d05c60ec5f86a Gerrit-Change-Number: 12794 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon <kredon at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190203/975416f9/attachment.htm>