noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Started to change static global variable names of usb so that multiple usb devices don't conflict / overwrite

This commit is contained in:
Roger Clark 2016-07-23 14:34:20 +10:00
parent 874e5342a1
commit b290cda98a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
STM32F1/cores/maple/libmaple/usb/stm32f1/usb_cdcacm.c
View File

@ -240,18 +240,18 @@ static const usb_descriptor_string usbVcomDescriptor_iProduct = {
.bString = {'M', 0, 'a', 0, 'p', 0, 'l', 0, 'e', 0}, .bString = {'M', 0, 'a', 0, 'p', 0, 'l', 0, 'e', 0},
}; };
static ONE_DESCRIPTOR Device_Descriptor = { static ONE_DESCRIPTOR usbCDCACMDevice_Descriptor = {
(uint8*)&usbVcomDescriptor_Device, (uint8*)&usbVcomDescriptor_Device,
sizeof(usb_descriptor_device) sizeof(usb_descriptor_device)
}; };
static ONE_DESCRIPTOR Config_Descriptor = { static ONE_DESCRIPTOR usbCDCACMConfig_Descriptor = {
(uint8*)&usbVcomDescriptor_Config, (uint8*)&usbVcomDescriptor_Config,
sizeof(usb_descriptor_config) sizeof(usb_descriptor_config)
}; };
#define N_STRING_DESCRIPTORS 3 #define N_STRING_DESCRIPTORS 3
static ONE_DESCRIPTOR String_Descriptor[N_STRING_DESCRIPTORS] = { static ONE_DESCRIPTOR usbCDCACMString_Descriptor[N_STRING_DESCRIPTORS] = {
{(uint8*)&usbVcomDescriptor_LangID, USB_DESCRIPTOR_STRING_LEN(1)}, {(uint8*)&usbVcomDescriptor_LangID, USB_DESCRIPTOR_STRING_LEN(1)},
{(uint8*)&usbVcomDescriptor_iManufacturer,USB_DESCRIPTOR_STRING_LEN(8)}, {(uint8*)&usbVcomDescriptor_iManufacturer,USB_DESCRIPTOR_STRING_LEN(8)},
{(uint8*)&usbVcomDescriptor_iProduct, USB_DESCRIPTOR_STRING_LEN(5)} {(uint8*)&usbVcomDescriptor_iProduct, USB_DESCRIPTOR_STRING_LEN(5)}
@ -726,11 +726,11 @@ static RESULT usbGetInterfaceSetting(uint8 interface, uint8 alt_setting) {
} }
static uint8* usbGetDeviceDescriptor(uint16 length) { static uint8* usbGetDeviceDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Device_Descriptor); return Standard_GetDescriptorData(length, &usbCDCACMDevice_Descriptor);
} }
static uint8* usbGetConfigDescriptor(uint16 length) { static uint8* usbGetConfigDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Config_Descriptor); return Standard_GetDescriptorData(length, &usbCDCACMConfig_Descriptor);
} }
static uint8* usbGetStringDescriptor(uint16 length) { static uint8* usbGetStringDescriptor(uint16 length) {
@ -739,7 +739,7 @@ static uint8* usbGetStringDescriptor(uint16 length) {
if (wValue0 > N_STRING_DESCRIPTORS) { if (wValue0 > N_STRING_DESCRIPTORS) {
return NULL; return NULL;
} }
return Standard_GetDescriptorData(length, &String_Descriptor[wValue0]); return Standard_GetDescriptorData(length, &usbCDCACMString_Descriptor[wValue0]);
} }
static void usbSetConfiguration(void) { static void usbSetConfiguration(void) {

14
STM32F1/cores/maple/libmaple/usb/stm32f1/usb_hid.c
View File

@ -343,12 +343,12 @@ static const usb_descriptor_string usbHIDDescriptor_iInterface = {
.bString = {'H', 0, 'I', 0, 'D', 0}, .bString = {'H', 0, 'I', 0, 'D', 0},
}; };
static ONE_DESCRIPTOR Device_Descriptor = { static ONE_DESCRIPTOR usbHIDDevice_Descriptor = {
(uint8*)&usbHIDDescriptor_Device, (uint8*)&usbHIDDescriptor_Device,
sizeof(usb_descriptor_device) sizeof(usb_descriptor_device)
}; };
static ONE_DESCRIPTOR Config_Descriptor = { static ONE_DESCRIPTOR usbHIDConfig_Descriptor = {
(uint8*)&usbHIDDescriptor_Config, (uint8*)&usbHIDDescriptor_Config,
sizeof(usbHIDDescriptor_Config) sizeof(usbHIDDescriptor_Config)
}; };
@ -359,7 +359,7 @@ static ONE_DESCRIPTOR HID_Report_Descriptor = {
}; };
#define N_STRING_DESCRIPTORS 3 #define N_STRING_DESCRIPTORS 3
static ONE_DESCRIPTOR String_Descriptor[N_STRING_DESCRIPTORS] = { static ONE_DESCRIPTOR usbHIDString_Descriptor[N_STRING_DESCRIPTORS] = {
{(uint8*)&usbHIDDescriptor_LangID, USB_DESCRIPTOR_STRING_LEN(1)}, {(uint8*)&usbHIDDescriptor_LangID, USB_DESCRIPTOR_STRING_LEN(1)},
{(uint8*)&usbHIDDescriptor_iManufacturer,USB_DESCRIPTOR_STRING_LEN(8)}, {(uint8*)&usbHIDDescriptor_iManufacturer,USB_DESCRIPTOR_STRING_LEN(8)},
{(uint8*)&usbHIDDescriptor_iProduct, USB_DESCRIPTOR_STRING_LEN(5)}, {(uint8*)&usbHIDDescriptor_iProduct, USB_DESCRIPTOR_STRING_LEN(5)},
@ -692,11 +692,11 @@ static RESULT usbGetInterfaceSetting(uint8 interface, uint8 alt_setting) {
} }
static uint8* usbGetDeviceDescriptor(uint16 length) { static uint8* usbGetDeviceDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Device_Descriptor); return Standard_GetDescriptorData(length, &usbHIDDevice_Descriptor);
} }
static uint8* usbGetConfigDescriptor(uint16 length) { static uint8* usbGetConfigDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Config_Descriptor); return Standard_GetDescriptorData(length, &usbHIDConfig_Descriptor);
} }
static uint8* usbGetStringDescriptor(uint16 length) { static uint8* usbGetStringDescriptor(uint16 length) {
@ -705,7 +705,7 @@ static uint8* usbGetStringDescriptor(uint16 length) {
if (wValue0 > N_STRING_DESCRIPTORS) { if (wValue0 > N_STRING_DESCRIPTORS) {
return NULL; return NULL;
} }
return Standard_GetDescriptorData(length, &String_Descriptor[wValue0]); return Standard_GetDescriptorData(length, &usbHIDString_Descriptor[wValue0]);
} }
/* /*
@ -730,7 +730,7 @@ static uint8* HID_GetReportDescriptor(uint16 Length){
static uint8* HID_GetHIDDescriptor(uint16 Length) static uint8* HID_GetHIDDescriptor(uint16 Length)
{ {
return Standard_GetDescriptorData(Length, &Config_Descriptor); return Standard_GetDescriptorData(Length, &usbHIDConfig_Descriptor);
} }
static void usbSetConfiguration(void) { static void usbSetConfiguration(void) {

8
STM32F1/cores/maple/libmaple/usb/stm32f1/usb_midi_device.c
View File

@ -311,12 +311,12 @@ static const usb_descriptor_string usbMIDIDescriptor_iJack1 = {
}; };
static ONE_DESCRIPTOR Device_Descriptor = { static ONE_DESCRIPTOR usbMidiDevice_Descriptor = {
(uint8*)&usbMIDIDescriptor_Device, (uint8*)&usbMIDIDescriptor_Device,
sizeof(usb_descriptor_device) sizeof(usb_descriptor_device)
}; };
static ONE_DESCRIPTOR Config_Descriptor = { static ONE_DESCRIPTOR usbMidiConfig_Descriptor = {
(uint8*)&usbMIDIDescriptor_Config, (uint8*)&usbMIDIDescriptor_Config,
sizeof(usb_descriptor_config) sizeof(usb_descriptor_config)
}; };
@ -662,11 +662,11 @@ static RESULT usbGetInterfaceSetting(uint8 interface, uint8 alt_setting) {
} }
static uint8* usbGetDeviceDescriptor(uint16 length) { static uint8* usbGetDeviceDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Device_Descriptor); return Standard_GetDescriptorData(length, &usbMidiDevice_Descriptor);
} }
static uint8* usbGetConfigDescriptor(uint16 length) { static uint8* usbGetConfigDescriptor(uint16 length) {
return Standard_GetDescriptorData(length, &Config_Descriptor); return Standard_GetDescriptorData(length, &usbMidiConfig_Descriptor);
} }
static uint8* usbGetStringDescriptor(uint16 length) { static uint8* usbGetStringDescriptor(uint16 length) {