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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16516 ) Change subject: Patch actual board name into the USB iProduct string descriptor ...................................................................... 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 --- M firmware/Makefile M firmware/apps/cardem/usb_strings.txt M firmware/apps/dfu/usb_strings.txt M firmware/apps/freq_ctr/usb_strings.txt M firmware/apps/gpio_test/usb_strings.txt M firmware/apps/trace/usb_strings.txt A firmware/libboard/octsimtest/product_string.txt A firmware/libboard/owhw/product_string.txt A firmware/libboard/qmod/product_string.txt A firmware/libboard/simtrace/product_string.txt 10 files changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 4318e2d..a684424 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -195,7 +195,11 @@ 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 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a Gerrit-Change-Number: 16516 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191206/046bc7e1/attachment.htm>