<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16516">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Patch actual board name into the USB iProduct string descriptor<br><br>"SIMtrace 2 compatible device" is pretty generic.  Let's have the<br>actual board name inside the string descriptors, giving a more<br>user friendly experience in case users are issuing 'lsusb' and the<br>like.<br><br>Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a<br>---<br>M firmware/Makefile<br>M firmware/apps/cardem/usb_strings.txt<br>M firmware/apps/dfu/usb_strings.txt<br>M firmware/apps/freq_ctr/usb_strings.txt<br>M firmware/apps/gpio_test/usb_strings.txt<br>M firmware/apps/trace/usb_strings.txt<br>A firmware/libboard/octsimtest/product_string.txt<br>A firmware/libboard/owhw/product_string.txt<br>A firmware/libboard/qmod/product_string.txt<br>A firmware/libboard/simtrace/product_string.txt<br>10 files changed, 15 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/16516/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/Makefile b/firmware/Makefile</span><br><span>index 4318e2d..a684424 100644</span><br><span>--- a/firmware/Makefile</span><br><span>+++ b/firmware/Makefile</span><br><span>@@ -195,7 +195,11 @@</span><br><span> usbstring/usbstring: usbstring/usbstring.c</span><br><span>        gcc $^ -o $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: apps/$(APP)/usb_strings.txt.patched</span><br><span style="color: hsl(120, 100%, 40%);">+apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt</span><br><span style="color: hsl(120, 100%, 40%);">+   sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring</span><br><span>    cat $< | usbstring/usbstring > $@</span><br><span> </span><br><span> define RULES</span><br><span>@@ -235,6 +239,7 @@</span><br><span>    lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts )</span><br><span> </span><br><span> clean:</span><br><span style="color: hsl(120, 100%, 40%);">+        -rm -f apps/$(APP)/usb_strings.txt.patched</span><br><span>   -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p`</span><br><span> </span><br><span> install:</span><br><span>diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt</span><br><span>index f0cd24c..3a1bcc3 100644</span><br><span>--- a/firmware/apps/cardem/usb_strings.txt</span><br><span>+++ b/firmware/apps/cardem/usb_strings.txt</span><br><span>@@ -1,5 +1,5 @@</span><br><span> sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(0, 100%, 40%);">-SIMtrace 2 compatible device</span><br><span style="color: hsl(120, 100%, 40%);">+PRODUCT_STRING</span><br><span> SIMtrace Sniffer</span><br><span> SIMtrace CCID</span><br><span> SIMtrace Card Emulation</span><br><span>diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt</span><br><span>index 8a4facb..f1c79bc 100644</span><br><span>--- a/firmware/apps/dfu/usb_strings.txt</span><br><span>+++ b/firmware/apps/dfu/usb_strings.txt</span><br><span>@@ -1,5 +1,5 @@</span><br><span> sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(0, 100%, 40%);">-SIMtrace 2 compatible device</span><br><span style="color: hsl(120, 100%, 40%);">+PRODUCT_STRING</span><br><span> DFU (Device Firmware Upgrade)</span><br><span> RAM</span><br><span> Flash (Application Partition)</span><br><span>diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt</span><br><span>index f0cd24c..3a1bcc3 100644</span><br><span>--- a/firmware/apps/freq_ctr/usb_strings.txt</span><br><span>+++ b/firmware/apps/freq_ctr/usb_strings.txt</span><br><span>@@ -1,5 +1,5 @@</span><br><span> sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(0, 100%, 40%);">-SIMtrace 2 compatible device</span><br><span style="color: hsl(120, 100%, 40%);">+PRODUCT_STRING</span><br><span> SIMtrace Sniffer</span><br><span> SIMtrace CCID</span><br><span> SIMtrace Card Emulation</span><br><span>diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt</span><br><span>index f0cd24c..3a1bcc3 100644</span><br><span>--- a/firmware/apps/gpio_test/usb_strings.txt</span><br><span>+++ b/firmware/apps/gpio_test/usb_strings.txt</span><br><span>@@ -1,5 +1,5 @@</span><br><span> sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(0, 100%, 40%);">-SIMtrace 2 compatible device</span><br><span style="color: hsl(120, 100%, 40%);">+PRODUCT_STRING</span><br><span> SIMtrace Sniffer</span><br><span> SIMtrace CCID</span><br><span> SIMtrace Card Emulation</span><br><span>diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt</span><br><span>index f0cd24c..3a1bcc3 100644</span><br><span>--- a/firmware/apps/trace/usb_strings.txt</span><br><span>+++ b/firmware/apps/trace/usb_strings.txt</span><br><span>@@ -1,5 +1,5 @@</span><br><span> sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(0, 100%, 40%);">-SIMtrace 2 compatible device</span><br><span style="color: hsl(120, 100%, 40%);">+PRODUCT_STRING</span><br><span> SIMtrace Sniffer</span><br><span> SIMtrace CCID</span><br><span> SIMtrace Card Emulation</span><br><span>diff --git a/firmware/libboard/octsimtest/product_string.txt b/firmware/libboard/octsimtest/product_string.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..83cbcf5</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libboard/octsimtest/product_string.txt</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+sysmoOCTSIM-Tester</span><br><span>diff --git a/firmware/libboard/owhw/product_string.txt b/firmware/libboard/owhw/product_string.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..77c3b1b</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libboard/owhw/product_string.txt</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+OWHW</span><br><span>diff --git a/firmware/libboard/qmod/product_string.txt b/firmware/libboard/qmod/product_string.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..2407b9d</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libboard/qmod/product_string.txt</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+sysmoQMOD (Quad Modem)</span><br><span>diff --git a/firmware/libboard/simtrace/product_string.txt b/firmware/libboard/simtrace/product_string.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..5634f3a</span><br><span>--- /dev/null</span><br><span>+++ b/firmware/libboard/simtrace/product_string.txt</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SIMtrace 2</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16516">change 16516</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/simtrace2/+/16516"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a </div>
<div style="display:none"> Gerrit-Change-Number: 16516 </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>