diff options
author | Harald Welte <laforge@osmocom.org> | 2019-12-06 19:17:53 +0100 |
---|---|---|
committer | Harald Welte <laforge@osmocom.org> | 2019-12-06 19:19:23 +0100 |
commit | 36f888f8b586c06400b8a4b816862f00efb2e111 (patch) | |
tree | 54cdfe408c0b016c31cc0bc6725f99b20b160498 | |
parent | 0a7c691b90b82cf934fe55b9ce9b86d35262d020 (diff) |
Patch actual board name into the USB iProduct string descriptor
"SIMtrace 2 compatible device" is pretty generic. Let's have the
actual board name inside the string descriptors, giving a more
user friendly experience in case users are issuing 'lsusb' and the
like.
Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a
-rw-r--r-- | firmware/Makefile | 7 | ||||
-rw-r--r-- | firmware/apps/cardem/usb_strings.txt | 2 | ||||
-rw-r--r-- | firmware/apps/dfu/usb_strings.txt | 2 | ||||
-rw-r--r-- | firmware/apps/freq_ctr/usb_strings.txt | 2 | ||||
-rw-r--r-- | firmware/apps/gpio_test/usb_strings.txt | 2 | ||||
-rw-r--r-- | firmware/apps/trace/usb_strings.txt | 2 | ||||
-rw-r--r-- | firmware/libboard/octsimtest/product_string.txt | 1 | ||||
-rw-r--r-- | firmware/libboard/owhw/product_string.txt | 1 | ||||
-rw-r--r-- | firmware/libboard/qmod/product_string.txt | 1 | ||||
-rw-r--r-- | firmware/libboard/simtrace/product_string.txt | 1 |
10 files changed, 15 insertions, 6 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 4318e2d..a684424 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -195,7 +195,11 @@ $(BIN) $(OBJ): usbstring/usbstring: usbstring/usbstring.c gcc $^ -o $@ -apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring +.PHONY: apps/$(APP)/usb_strings.txt.patched +apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt + sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@ + +apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring cat $< | usbstring/usbstring > $@ define RULES @@ -235,6 +239,7 @@ log: lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts ) clean: + -rm -f apps/$(APP)/usb_strings.txt.patched -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p` install: diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/cardem/usb_strings.txt +++ b/firmware/apps/cardem/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt index 8a4facb..f1c79bc 100644 --- a/firmware/apps/dfu/usb_strings.txt +++ b/firmware/apps/dfu/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING DFU (Device Firmware Upgrade) RAM Flash (Application Partition) diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/freq_ctr/usb_strings.txt +++ b/firmware/apps/freq_ctr/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/gpio_test/usb_strings.txt +++ b/firmware/apps/gpio_test/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/trace/usb_strings.txt +++ b/firmware/apps/trace/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/libboard/octsimtest/product_string.txt b/firmware/libboard/octsimtest/product_string.txt new file mode 100644 index 0000000..83cbcf5 --- /dev/null +++ b/firmware/libboard/octsimtest/product_string.txt @@ -0,0 +1 @@ +sysmoOCTSIM-Tester diff --git a/firmware/libboard/owhw/product_string.txt b/firmware/libboard/owhw/product_string.txt new file mode 100644 index 0000000..77c3b1b --- /dev/null +++ b/firmware/libboard/owhw/product_string.txt @@ -0,0 +1 @@ +OWHW diff --git a/firmware/libboard/qmod/product_string.txt b/firmware/libboard/qmod/product_string.txt new file mode 100644 index 0000000..2407b9d --- /dev/null +++ b/firmware/libboard/qmod/product_string.txt @@ -0,0 +1 @@ +sysmoQMOD (Quad Modem) diff --git a/firmware/libboard/simtrace/product_string.txt b/firmware/libboard/simtrace/product_string.txt new file mode 100644 index 0000000..5634f3a --- /dev/null +++ b/firmware/libboard/simtrace/product_string.txt @@ -0,0 +1 @@ +SIMtrace 2 |