From 09ea0d1fd5bff947d2d88f2a763158a97d5309e1 Mon Sep 17 00:00:00 2001 From: paul eeepc Date: Fri, 18 Nov 2016 02:57:10 -0600 Subject: [PATCH] removing object/bin files as they don't belong. updating usbdrv.h usbdrv.c and main.c so bootloader with const for PROGMEM entires resolves compiling errors on new versions of avr-gcc. Still have some warnings to resolve.. If going to use this version of bootloader should prob update V-USB driver code --- bootloader/bootloadHID-master/firmware/main.bin | Bin 6315 -> 0 bytes bootloader/bootloadHID-master/firmware/main.c | 2 +- bootloader/bootloadHID-master/firmware/main.o | Bin 4628 -> 0 bytes .../bootloadHID-master/firmware/usbdrv/oddebug.o | Bin 623 -> 0 bytes .../bootloadHID-master/firmware/usbdrv/usbdrv.c | 12 ++++++------ .../bootloadHID-master/firmware/usbdrv/usbdrv.h | 14 +++++++------- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 bootloader/bootloadHID-master/firmware/main.bin delete mode 100644 bootloader/bootloadHID-master/firmware/main.o delete mode 100644 bootloader/bootloadHID-master/firmware/usbdrv/oddebug.o diff --git a/bootloader/bootloadHID-master/firmware/main.bin b/bootloader/bootloadHID-master/firmware/main.bin deleted file mode 100644 index 9cd2ac6f166a62354cd4583dba7dbabc8d09334d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6315 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 E0U|*=Hvj+t diff --git a/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.c b/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.c index 21ed554..e37727c 100644 --- a/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.c +++ b/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.c @@ -67,7 +67,7 @@ optimizing hints: #if USB_CFG_DESCR_PROPS_STRING_0 == 0 #undef USB_CFG_DESCR_PROPS_STRING_0 #define USB_CFG_DESCR_PROPS_STRING_0 sizeof(usbDescriptorString0) -PROGMEM char usbDescriptorString0[] = { /* language descriptor */ +PROGMEM const char usbDescriptorString0[] = { /* language descriptor */ 4, /* sizeof(usbDescriptorString0): length of descriptor in bytes */ 3, /* descriptor type */ 0x09, 0x04, /* language index (0x0409 = US-English) */ @@ -77,7 +77,7 @@ PROGMEM char usbDescriptorString0[] = { /* language descriptor */ #if USB_CFG_DESCR_PROPS_STRING_VENDOR == 0 && USB_CFG_VENDOR_NAME_LEN #undef USB_CFG_DESCR_PROPS_STRING_VENDOR #define USB_CFG_DESCR_PROPS_STRING_VENDOR sizeof(usbDescriptorStringVendor) -PROGMEM int usbDescriptorStringVendor[] = { +PROGMEM const int usbDescriptorStringVendor[] = { USB_STRING_DESCRIPTOR_HEADER(USB_CFG_VENDOR_NAME_LEN), USB_CFG_VENDOR_NAME }; @@ -86,7 +86,7 @@ PROGMEM int usbDescriptorStringVendor[] = { #if USB_CFG_DESCR_PROPS_STRING_PRODUCT == 0 && USB_CFG_DEVICE_NAME_LEN #undef USB_CFG_DESCR_PROPS_STRING_PRODUCT #define USB_CFG_DESCR_PROPS_STRING_PRODUCT sizeof(usbDescriptorStringDevice) -PROGMEM int usbDescriptorStringDevice[] = { +PROGMEM const int usbDescriptorStringDevice[] = { USB_STRING_DESCRIPTOR_HEADER(USB_CFG_DEVICE_NAME_LEN), USB_CFG_DEVICE_NAME }; @@ -95,7 +95,7 @@ PROGMEM int usbDescriptorStringDevice[] = { #if USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER == 0 && USB_CFG_SERIAL_NUMBER_LEN #undef USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER sizeof(usbDescriptorStringSerialNumber) -PROGMEM int usbDescriptorStringSerialNumber[] = { +PROGMEM const int usbDescriptorStringSerialNumber[] = { USB_STRING_DESCRIPTOR_HEADER(USB_CFG_SERIAL_NUMBER_LEN), USB_CFG_SERIAL_NUMBER }; @@ -108,7 +108,7 @@ PROGMEM int usbDescriptorStringSerialNumber[] = { #if USB_CFG_DESCR_PROPS_DEVICE == 0 #undef USB_CFG_DESCR_PROPS_DEVICE #define USB_CFG_DESCR_PROPS_DEVICE sizeof(usbDescriptorDevice) -PROGMEM char usbDescriptorDevice[] = { /* USB device descriptor */ +PROGMEM const char usbDescriptorDevice[] = { /* USB device descriptor */ 18, /* sizeof(usbDescriptorDevice): length of descriptor in bytes */ USBDESCR_DEVICE, /* descriptor type */ 0x10, 0x01, /* USB version supported */ @@ -139,7 +139,7 @@ PROGMEM char usbDescriptorDevice[] = { /* USB device descriptor */ #if USB_CFG_DESCR_PROPS_CONFIGURATION == 0 #undef USB_CFG_DESCR_PROPS_CONFIGURATION #define USB_CFG_DESCR_PROPS_CONFIGURATION sizeof(usbDescriptorConfiguration) -PROGMEM char usbDescriptorConfiguration[] = { /* USB configuration descriptor */ +PROGMEM const char usbDescriptorConfiguration[] = { /* USB configuration descriptor */ 9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */ USBDESCR_CONFIG, /* descriptor type */ 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + diff --git a/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.h b/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.h index 3a78f30..e8cc4b3 100644 --- a/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.h +++ b/bootloader/bootloadHID-master/firmware/usbdrv/usbdrv.h @@ -450,43 +450,43 @@ extern volatile schar usbRxLen; #ifndef __ASSEMBLER__ extern #if !(USB_CFG_DESCR_PROPS_DEVICE & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif char usbDescriptorDevice[]; extern #if !(USB_CFG_DESCR_PROPS_CONFIGURATION & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif char usbDescriptorConfiguration[]; extern #if !(USB_CFG_DESCR_PROPS_HID_REPORT & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif char usbDescriptorHidReport[]; extern #if !(USB_CFG_DESCR_PROPS_STRING_0 & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif char usbDescriptorString0[]; extern #if !(USB_CFG_DESCR_PROPS_STRING_VENDOR & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif int usbDescriptorStringVendor[]; extern #if !(USB_CFG_DESCR_PROPS_STRING_PRODUCT & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif int usbDescriptorStringDevice[]; extern #if !(USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER & USB_PROP_IS_RAM) -PROGMEM +PROGMEM const #endif int usbDescriptorStringSerialNumber[];