Hoernchen has uploaded this change for review.
ver in usb prod desc
previously:
[Wed Jan 29 17:26:19 2025] usb 3-1: Product: sysmoOCTSIM (osmo-ASF4-DFU)
now, just like the main app with ver:
[Wed Jan 29 18:41:19 2025] usb 3-1: Product: sysmoOCTSIM DFU-0.1.16-9852
Change-Id: I1f183695a3e458db2668e9950f859c936a821dc8
---
M usb_flash_main.c
M usb_start.c
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/38/39438/1
diff --git a/usb_flash_main.c b/usb_flash_main.c
index dd2523f..c944771 100644
--- a/usb_flash_main.c
+++ b/usb_flash_main.c
@@ -120,8 +120,9 @@
}
char sernr_buf[16*2+1];
-//unicode for descriptor
-uint8_t sernr_buf_descr[1+1+16*2*2];
+char product_buf[] = "sysmoOCTSIM DFU-"GIT_VERSION;
+uint8_t __attribute__ ((aligned (16))) sernr_buf_descr[1+1+16*2*2];
+uint8_t __attribute__ ((aligned (16))) product_buf_descr[1+1+(sizeof(product_buf)-1)*2];
#endif
int main(void)
@@ -130,6 +131,7 @@
#if defined(SYSMOOCTSIM)
get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf));
str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr));
+ str_to_usb_desc(product_buf, sizeof(product_buf)-1, product_buf_descr, sizeof(product_buf_descr));
#endif
// errata 2.6.10, do not remove this, ever.
diff --git a/usb_start.c b/usb_start.c
index dacd325..86b396e 100644
--- a/usb_start.c
+++ b/usb_start.c
@@ -72,6 +72,8 @@
}
extern uint8_t sernr_buf_descr[];
+extern uint8_t product_buf_descr[];
+
/* call-back for every control EP request */
static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage)
{
@@ -101,6 +103,8 @@
switch (index) {
case CONF_USB_DFUD_ISERIALNUM:
return send_str_desc(ep, req, stage, sernr_buf_descr);
+ case CONF_USB_DFUD_IPRODUCT:
+ return send_str_desc(ep, req, stage, product_buf_descr);
default:
return ERR_NOT_FOUND;
}
To view, visit change 39438. To unsubscribe, or for help writing mail filters, visit settings.