diff options
| author | laforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-25 21:36:42 +0000 |
|---|---|---|
| committer | laforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-09-25 21:36:42 +0000 |
| commit | 89c40594e76db780d1b72795901a8e8754810a62 (patch) | |
| tree | f75507698f8e39f50e46c00d27543d11c845004a | |
| parent | 5872753e2dbdca5b252470c5210cdf54ee1788dd (diff) | |
- fix minor issues with USB string support
git-svn-id: https://svn.openpcd.org:2342/trunk@228 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
| -rw-r--r-- | firmware/Makefile | 6 | ||||
| -rw-r--r-- | firmware/src/dfu/dfu.c | 2 | ||||
| -rw-r--r-- | firmware/src/os/pcd_enumerate.c | 2 | ||||
| -rw-r--r-- | firmware/src/picc/usb_strings_app.txt | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 6dabd9a..f94800b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -69,6 +69,8 @@ PATH_TO_LINKSCRIPTS=link/ # Target file name (without extension). TARGET:=main_reqa +USBSTRINGS=src/picc/usb_strings_app.h src/pcd/usb_strings_app.h + # List C source files here. (C dependencies are automatically generated.) # use file-extension c for "c-only"-files SRC = @@ -494,7 +496,7 @@ $(COBJ) : %.o : %.c $(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@ # Compile: create object files from C source files. ARM-only -$(COBJARM) : %.o : %.c include/compile.h +$(COBJARM) : %.o : %.c include/compile.h $(USBSTRINGS) @echo @echo $(MSG_COMPILING_ARM) $< $(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@ @@ -572,7 +574,7 @@ clean_list : include/compile.h: scripts/mkcompile_h > $@ -src/picc/usb_strings_app.h: ./scripts/usbstring src/picc/usb_strings_app.txt +$(USBSTRINGS): %.h : %.txt ./scripts/usbstring cat $< | ./scripts/usbstring > $@ # Include the dependency files. diff --git a/firmware/src/dfu/dfu.c b/firmware/src/dfu/dfu.c index 40ad64f..2295853 100644 --- a/firmware/src/dfu/dfu.c +++ b/firmware/src/dfu/dfu.c @@ -678,7 +678,7 @@ static __dfufunc void dfu_udp_ep0_handler(void) udp_ep0_send_stall(); break; } - DEBUGP("bLength=%u, wLength=%u\n", + DEBUGE("bLength=%u, wLength=%u ", usb_strings[desc_index]->bLength, wLength); udp_ep0_send_data((const char *) usb_strings[desc_index], MIN(usb_strings[desc_index]->bLength, diff --git a/firmware/src/os/pcd_enumerate.c b/firmware/src/os/pcd_enumerate.c index 588831c..c170dc5 100644 --- a/firmware/src/os/pcd_enumerate.c +++ b/firmware/src/os/pcd_enumerate.c @@ -34,7 +34,7 @@ #include <lib_AT91SAM7.h> #include <openpcd.h> -#include <usb_strings.h> +#include <usb_strings_app.h> #include <os/pcd_enumerate.h> #include <os/req_ctx.h> diff --git a/firmware/src/picc/usb_strings_app.txt b/firmware/src/picc/usb_strings_app.txt index ea08dab..d892c72 100644 --- a/firmware/src/picc/usb_strings_app.txt +++ b/firmware/src/picc/usb_strings_app.txt @@ -2,5 +2,5 @@ OpenPICC DFU Interface - Application Partition OpenPICC DFU Interface - Bootloader Partition bitmanufaktur.de IT Solutions and hmw-consulting.de OpenPICC RFID Simulator - Runtime Mode -OpenPIIC Runtime Configuration +OpenPICC Runtime Configuration OpenPICC Runtime Interface |