diff options
| author | hathach <[email protected]> | 2025-10-29 20:30:35 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-10-29 20:32:50 +0700 |
| commit | 4da7845747497ac93794d9a3bcfabaeebef933d1 (patch) | |
| tree | 99b579305459775d5381d24d8d9a47f78a9a22ff /examples/host/device_info | |
| parent | 4a52edd93b926e3783d998b55bdb0c56e52a839f (diff) | |
| parent | 3ff54153d42c83fc0a1e13106c6632c3237b1670 (diff) | |
Merge branch 'master' into dwc2_ep0
# Conflicts:
# examples/device/dfu/src/usb_descriptors.c
# examples/device/dfu_runtime/src/usb_descriptors.c
# src/portable/synopsys/dwc2/dcd_dwc2.c
Diffstat (limited to 'examples/host/device_info')
| -rw-r--r-- | examples/host/device_info/Makefile | 8 | ||||
| -rw-r--r-- | examples/host/device_info/src/main.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/examples/host/device_info/Makefile b/examples/host/device_info/Makefile index 0235e08c3..f8292385e 100644 --- a/examples/host/device_info/Makefile +++ b/examples/host/device_info/Makefile @@ -1,13 +1,13 @@ -include ../../build_system/make/make.mk +include ../../../hw/bsp/family_support.mk INC += \ src \ - $(TOP)/hw \ + # Example source EXAMPLE_SOURCE += \ src/main.c -SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE)) +SRC_C += $(addprefix $(EXAMPLE_PATH)/, $(EXAMPLE_SOURCE)) -include ../../build_system/make/rules.mk +include ../../../hw/bsp/family_rules.mk diff --git a/examples/host/device_info/src/main.c b/examples/host/device_info/src/main.c index 419806551..f71702efc 100644 --- a/examples/host/device_info/src/main.c +++ b/examples/host/device_info/src/main.c @@ -171,9 +171,7 @@ void tuh_mount_cb(uint8_t daddr) { printf("\r\n"); printf(" iSerialNumber %u ", desc.device.iSerialNumber); - printf((char*)desc.serial); // serial is already to UTF-8 - printf("\r\n"); - + printf("%s\r\n", (char*)desc.serial); // serial is already to UTF-8 printf(" bNumConfigurations %u\r\n", desc.device.bNumConfigurations); } |