Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
72c2922e
Commit
72c2922e
authored
May 17, 2009
by
Dean Camera
Browse files
Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code.
parent
eeba38e3
Changes
22
Hide whitespace changes
Inline
Side-by-side
Bootloaders/CDC/Descriptors.c
View file @
72c2922e
...
...
@@ -220,22 +220,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
if
(
!
(
DescriptorNumber
))
{
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
LanguageString
.
Header
.
Size
;
}
else
{
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
ProductString
.
Header
.
Size
;
}
...
...
Bootloaders/DFU/Descriptors.c
View file @
72c2922e
...
...
@@ -154,22 +154,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
if
(
!
(
DescriptorNumber
))
{
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
&
LanguageString
;
Size
=
LanguageString
.
Header
.
Size
;
}
else
{
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
&
ProductString
;
Size
=
ProductString
.
Header
.
Size
;
}
...
...
Bootloaders/TeensyHID/Descriptors.c
View file @
72c2922e
...
...
@@ -183,32 +183,32 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
if
(
!
(
DescriptorNumber
))
{
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
LanguageString
.
Header
.
Size
;
}
else
{
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
ProductString
.
Header
.
Size
;
}
break
;
case
DTYPE_HID
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
HIDDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
HIDDescriptor
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
break
;
case
DTYPE_Report
:
Address
=
DESCRIPTOR_ADDRESS
(
HIDReport
)
;
Address
=
(
void
*
)
&
HIDReport
;
Size
=
sizeof
(
HIDReport
);
break
;
}
...
...
Demos/Device/AudioInput/Descriptors.c
View file @
72c2922e
...
...
@@ -282,26 +282,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/AudioOutput/Descriptors.c
View file @
72c2922e
...
...
@@ -282,26 +282,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/CDC/Descriptors.c
View file @
72c2922e
...
...
@@ -225,32 +225,32 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
const
uint8_t
DescriptorType
=
(
wValue
>>
8
);
const
uint8_t
DescriptorNumber
=
(
wValue
&
0xFF
);
void
*
Address
=
NULL
;
uint16_t
Size
=
NO_DESCRIPTOR
;
void
*
Address
=
NULL
;
uint16_t
Size
=
NO_DESCRIPTOR
;
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/DualCDC/Descriptors.c
View file @
72c2922e
...
...
@@ -353,26 +353,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/GenericHID/Descriptors.c
View file @
72c2922e
...
...
@@ -210,37 +210,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
break
;
case
DTYPE_HID
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
GenericHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
GenericHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
break
;
case
DTYPE_Report
:
Address
=
DESCRIPTOR_ADDRESS
(
GenericReport
)
;
Address
=
(
void
*
)
&
GenericReport
;
Size
=
sizeof
(
GenericReport
);
break
;
}
...
...
Demos/Device/Joystick/Descriptors.c
View file @
72c2922e
...
...
@@ -210,37 +210,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
break
;
case
DTYPE_HID
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
JoystickHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
JoystickHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
break
;
case
DTYPE_Report
:
Address
=
DESCRIPTOR_ADDRESS
(
JoystickReport
)
;
Address
=
(
void
*
)
&
JoystickReport
;
Size
=
sizeof
(
JoystickReport
);
break
;
}
...
...
Demos/Device/Keyboard/Descriptors.c
View file @
72c2922e
...
...
@@ -227,37 +227,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
break
;
case
DTYPE_HID
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
KeyboardHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
KeyboardHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
break
;
case
DTYPE_Report
:
Address
=
DESCRIPTOR_ADDRESS
(
KeyboardReport
)
;
Address
=
(
void
*
)
&
KeyboardReport
;
Size
=
sizeof
(
KeyboardReport
);
break
;
}
...
...
Demos/Device/KeyboardMouse/Descriptors.c
View file @
72c2922e
...
...
@@ -297,26 +297,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
@@ -325,24 +325,24 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
case
DTYPE_HID
:
if
(
!
(
wIndex
))
{
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
KeyboardHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
KeyboardHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
}
else
{
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
MouseHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
MouseHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
}
break
;
case
DTYPE_Report
:
if
(
!
(
wIndex
))
{
Address
=
DESCRIPTOR_ADDRESS
(
KeyboardReport
)
;
Address
=
(
void
*
)
&
KeyboardReport
;
Size
=
sizeof
(
KeyboardReport
);
}
else
{
Address
=
DESCRIPTOR_ADDRESS
(
MouseReport
)
;
Address
=
(
void
*
)
&
MouseReport
;
Size
=
sizeof
(
MouseReport
);
}
...
...
Demos/Device/MIDI/Descriptors.c
View file @
72c2922e
...
...
@@ -293,26 +293,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/MassStorage/Descriptors.c
View file @
72c2922e
...
...
@@ -187,30 +187,30 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
case
0x03
:
Address
=
DESCRIPTOR_ADDRESS
(
SerialNumberString
)
;
Address
=
(
void
*
)
&
SerialNumberString
;
Size
=
pgm_read_byte
(
&
SerialNumberString
.
Header
.
Size
);
break
;
}
...
...
Demos/Device/MassStorage/MassStorage.c
View file @
72c2922e
...
...
@@ -249,6 +249,11 @@ TASK(USB_MassStorage)
/* Reset the data endpoint banks */
Endpoint_ResetFIFO
(
MASS_STORAGE_OUT_EPNUM
);
Endpoint_ResetFIFO
(
MASS_STORAGE_IN_EPNUM
);
Endpoint_SelectEndpoint
(
MASS_STORAGE_OUT_EPNUM
);
Endpoint_ClearStall
();
Endpoint_SelectEndpoint
(
MASS_STORAGE_IN_EPNUM
);
Endpoint_ClearStall
();
/* Clear the abort transfer flag */
IsMassStoreReset
=
false
;
...
...
Demos/Device/Mouse/Descriptors.c
View file @
72c2922e
...
...
@@ -210,37 +210,37 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;
Address
=
(
void
*
)
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
DESCRIPTOR_ADDRESS
(
ProductString
)
;
Address
=
(
void
*
)
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
}
break
;
case
DTYPE_HID
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
.
MouseHID
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
.
MouseHID
;
Size
=
sizeof
(
USB_Descriptor_HID_t
);
break
;
case
DTYPE_Report
:
Address
=
DESCRIPTOR_ADDRESS
(
MouseReport
)
;
Address
=
(
void
*
)
&
MouseReport
;
Size
=
sizeof
(
MouseReport
);
break
;
}
...
...
Demos/Device/RNDISEthernet/Descriptors.c
View file @
72c2922e
...
...
@@ -231,26 +231,26 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
DESCRIPTOR_ADDRESS
(
DeviceDescriptor
)
;
Address
=
(
void
*
)
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
Address
=
DESCRIPTOR_ADDRESS
(
ConfigurationDescriptor
)
;
Address
=
(
void
*
)
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
DESCRIPTOR_ADDRESS
(
LanguageString
)
;
Address
=
(
void
*
)
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
DESCRIPTOR_ADDRESS
(
ManufacturerString
)
;