From b627ef90209f570cf6061357a7e9ac44546e2b77 Mon Sep 17 00:00:00 2001
From: Doug Brown <doug@downtowndougbrown.com>
Date: Sun, 28 May 2023 15:50:07 -0700
Subject: [PATCH] Move descriptors to RAM

This ensures they will work properly on the AT90USB128x, especially in
the bootloader where they will be in the upper 64 KB.
---
 .cproject                    |  4 ++--
 hal/at90usb646/Descriptors.c | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cproject b/.cproject
index 2db39f7..2ab5e3b 100644
--- a/.cproject
+++ b/.cproject
@@ -37,7 +37,7 @@
 									<listOptionValue builtIn="false" value="ORDERED_EP_CONFIG"/>
 									<listOptionValue builtIn="false" value="FIXED_CONTROL_ENDPOINT_SIZE=8"/>
 									<listOptionValue builtIn="false" value="FIXED_NUM_CONFIGURATIONS=1"/>
-									<listOptionValue builtIn="false" value="USE_FLASH_DESCRIPTORS"/>
+									<listOptionValue builtIn="false" value="USE_RAM_DESCRIPTORS"/>
 									<listOptionValue builtIn="false" value="USE_STATIC_OPTIONS=&quot;(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_MANUAL_PLL)&quot;"/>
 								</option>
 								<option id="de.innot.avreclipse.compiler.option.otherflags.1513967861" name="Other flags" superClass="de.innot.avreclipse.compiler.option.otherflags" value="-ffunction-sections -fdata-sections" valueType="string"/>
@@ -112,7 +112,7 @@
 									<listOptionValue builtIn="false" value="ORDERED_EP_CONFIG"/>
 									<listOptionValue builtIn="false" value="FIXED_CONTROL_ENDPOINT_SIZE=8"/>
 									<listOptionValue builtIn="false" value="FIXED_NUM_CONFIGURATIONS=1"/>
-									<listOptionValue builtIn="false" value="USE_FLASH_DESCRIPTORS"/>
+									<listOptionValue builtIn="false" value="USE_RAM_DESCRIPTORS"/>
 									<listOptionValue builtIn="false" value="USE_STATIC_OPTIONS=&quot;(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_MANUAL_PLL)&quot;"/>
 								</option>
 								<option id="de.innot.avreclipse.compiler.option.otherflags.1566165436" name="Other flags" superClass="de.innot.avreclipse.compiler.option.otherflags" value="-ffunction-sections -fdata-sections" valueType="string"/>
diff --git a/hal/at90usb646/Descriptors.c b/hal/at90usb646/Descriptors.c
index fdd607b..7c5c830 100644
--- a/hal/at90usb646/Descriptors.c
+++ b/hal/at90usb646/Descriptors.c
@@ -54,7 +54,7 @@
  *  number of device configurations. The descriptor is read out by the USB host when the enumeration
  *  process begins.
  */
-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+const USB_Descriptor_Device_t DeviceDescriptor =
 {
 	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
@@ -81,7 +81,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
  *  a configuration so that the host may correctly communicate with the USB device.
  */
-const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t ConfigurationDescriptor =
 {
 	.Config =
 		{
@@ -190,7 +190,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
  *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
  *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
  */
-const USB_Descriptor_String_t PROGMEM LanguageString =
+const USB_Descriptor_String_t LanguageString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
 
@@ -201,7 +201,7 @@ const USB_Descriptor_String_t PROGMEM LanguageString =
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-const USB_Descriptor_String_t PROGMEM ManufacturerString =
+const USB_Descriptor_String_t ManufacturerString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(10), .Type = DTYPE_String},
 
@@ -212,7 +212,7 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString =
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-const USB_Descriptor_String_t PROGMEM ProductString =
+const USB_Descriptor_String_t ProductString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
 
@@ -250,15 +250,15 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 			{
 				case 0x00:
 					Address = &LanguageString;
-					Size    = pgm_read_byte(&LanguageString.Header.Size);
+					Size    = LanguageString.Header.Size;
 					break;
 				case 0x01:
 					Address = &ManufacturerString;
-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
+					Size    = ManufacturerString.Header.Size;
 					break;
 				case 0x02:
 					Address = &ProductString;
-					Size    = pgm_read_byte(&ProductString.Header.Size);
+					Size    = ProductString.Header.Size;
 					break;
 			}