From f04006f05ead1ddde42ac84235664363d806327b Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 14 Nov 2022 16:11:34 +0100 Subject: [PATCH] change USB vendor string to tinysa.org, add USB product string for Ultra Signed-off-by: Martin --- usbcfg.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usbcfg.c b/usbcfg.c index 7341b06..b4f16bd 100644 --- a/usbcfg.c +++ b/usbcfg.c @@ -150,21 +150,31 @@ static const uint8_t vcom_string0[] = { * Vendor string. */ static const uint8_t vcom_string1[] = { - USB_DESC_BYTE(38), /* bLength. */ + USB_DESC_BYTE(22), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ - 'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0, - 'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0, - 'c', 0, 's', 0 + 't', 0, 'i', 0, 'n', 0, 'y', 0, 's', 0, 'a', 0, '.', 0, 'o', 0, 'r', 0, 'g', 0 }; +#ifdef TINYSA4 /* - * Device Description string, use the real name of the device. + * Device Description string, use "tinySA Ultra" + */ +static const uint8_t vcom_string2[] = { + USB_DESC_BYTE(26), /* bLength. */ + USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ + 't', 0, 'i', 0, 'n', 0, 'y', 0, 'S', 0, 'A', 0, + ' ', 0, 'U', 0, 'l', 0, 't', 0, 'r', 0, 'a', 0 +}; +#else +/* + * Device Description string, use "tinySA" */ static const uint8_t vcom_string2[] = { USB_DESC_BYTE(14), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ 't', 0, 'i', 0, 'n', 0, 'y', 0, 'S', 0, 'A', 0 }; +#endif /* * Serial Number string. TODO: use real product version.