Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile errors with avr-gcc 4.9.3 #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compile errors with avr-gcc 4.9.3 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Descriptors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* process begins.
*/
/* for SERIAL */
USB_Descriptor_Device_t PROGMEM DeviceDescriptorSerial =
const USB_Descriptor_Device_t PROGMEM DeviceDescriptorSerial =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

Expand All @@ -90,7 +90,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptorSerial =
};

/* for MIDI */
USB_Descriptor_Device_t PROGMEM DeviceDescriptorMIDI =
const USB_Descriptor_Device_t PROGMEM DeviceDescriptorMIDI =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

Expand Down Expand Up @@ -118,7 +118,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptorMIDI =
* a configuration so that the host may correctly communicate with the USB device.
*/
/* for Serial */
USB_Descriptor_ConfigurationCDC_t PROGMEM ConfigurationDescriptorSerial =
const USB_Descriptor_ConfigurationCDC_t PROGMEM ConfigurationDescriptorSerial =
{
.Config =
{
Expand Down Expand Up @@ -223,7 +223,7 @@ USB_Descriptor_ConfigurationCDC_t PROGMEM ConfigurationDescriptorSerial =
};

/* for MIDI */
USB_Descriptor_ConfigurationMIDI_t PROGMEM ConfigurationDescriptorMIDI =
const USB_Descriptor_ConfigurationMIDI_t PROGMEM ConfigurationDescriptorMIDI =
{
.Config =
{
Expand Down Expand Up @@ -402,7 +402,7 @@ USB_Descriptor_ConfigurationMIDI_t PROGMEM ConfigurationDescriptorMIDI =
* 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.
*/
USB_Descriptor_String_t PROGMEM LanguageString =
const USB_Descriptor_String_t PROGMEM LanguageString =
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

Expand All @@ -414,15 +414,15 @@ USB_Descriptor_String_t PROGMEM LanguageString =
* Descriptor.
*/
/* for Serial */
USB_Descriptor_String_t PROGMEM ManufacturerStringSerial =
const USB_Descriptor_String_t PROGMEM ManufacturerStringSerial =
{
.Header = {.Size = USB_STRING_LEN(24), .Type = DTYPE_String},

.UnicodeString = L"Arduino (www.arduino.cc)"
};

/* for MIDI */
USB_Descriptor_String_t PROGMEM ManufacturerStringMIDI =
const USB_Descriptor_String_t PROGMEM ManufacturerStringMIDI =
{
.Header = {.Size = USB_STRING_LEN(17), .Type = DTYPE_String},

Expand All @@ -433,7 +433,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerStringMIDI =
* Descriptor.
*/
/* for Serial */
USB_Descriptor_String_t PROGMEM ProductStringSerial =
const USB_Descriptor_String_t PROGMEM ProductStringSerial =
{
#if (ARDUINO_MODEL_PID == ARDUINO_UNO_PID)
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
Expand All @@ -451,7 +451,7 @@ USB_Descriptor_String_t PROGMEM ProductStringSerial =

};
/* for MIDI */
USB_Descriptor_String_t PROGMEM ProductStringMIDI =
const USB_Descriptor_String_t PROGMEM ProductStringMIDI =
{
.Header = {.Size = USB_STRING_LEN(8), .Type = DTYPE_String},

Expand Down