projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eeba38e
)
Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to...
author
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 17 May 2009 07:44:00 +0000
(07:44 +0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 17 May 2009 07:44:00 +0000
(07:44 +0000)
22 files changed:
Bootloaders/CDC/Descriptors.c
patch
|
blob
|
blame
|
history
Bootloaders/DFU/Descriptors.c
patch
|
blob
|
blame
|
history
Bootloaders/TeensyHID/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/AudioInput/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/AudioOutput/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/CDC/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/DualCDC/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/GenericHID/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/Joystick/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/Keyboard/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/KeyboardMouse/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/MIDI/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/MassStorage/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/MassStorage/MassStorage.c
patch
|
blob
|
blame
|
history
Demos/Device/Mouse/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/RNDISEthernet/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/Device/USBtoSerial/Descriptors.c
patch
|
blob
|
blame
|
history
Demos/OTG/TestApp/Descriptors.c
patch
|
blob
|
blame
|
history
LUFA/ChangeLog.txt
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/HighLevel/StdDescriptors.h
patch
|
blob
|
blame
|
history
LUFA/MigrationInformation.txt
patch
|
blob
|
blame
|
history
Projects/Magstripe/Descriptors.c
patch
|
blob
|
blame
|
history
diff --git
a/Bootloaders/CDC/Descriptors.c
b/Bootloaders/CDC/Descriptors.c
index
11b2e37
..
590b041
100644
(file)
--- a/
Bootloaders/CDC/Descriptors.c
+++ b/
Bootloaders/CDC/Descriptors.c
@@
-220,22
+220,22
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
diff --git
a/Bootloaders/DFU/Descriptors.c
b/Bootloaders/DFU/Descriptors.c
index
94f7404
..
cff3cd5
100644
(file)
--- a/
Bootloaders/DFU/Descriptors.c
+++ b/
Bootloaders/DFU/Descriptors.c
@@
-154,22
+154,22
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
&LanguageString
;
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
&ProductString
;
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
diff --git
a/Bootloaders/TeensyHID/Descriptors.c
b/Bootloaders/TeensyHID/Descriptors.c
index
b1642f1
..
62e2d21
100644
(file)
--- a/
Bootloaders/TeensyHID/Descriptors.c
+++ b/
Bootloaders/TeensyHID/Descriptors.c
@@
-183,32
+183,32
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
if (!(DescriptorNumber))
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
Size = LanguageString.Header.Size;
\r
}
\r
else
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = ProductString.Header.Size;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.HIDDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.HIDDescriptor
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(HIDReport)
;
\r
+ Address =
(void*)&HIDReport
;
\r
Size = sizeof(HIDReport);
\r
break;
\r
}
\r
Size = sizeof(HIDReport);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/AudioInput/Descriptors.c
b/Demos/Device/AudioInput/Descriptors.c
index
f15757e
..
5be5061
100644
(file)
--- a/
Demos/Device/AudioInput/Descriptors.c
+++ b/
Demos/Device/AudioInput/Descriptors.c
@@
-282,26
+282,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/AudioOutput/Descriptors.c
b/Demos/Device/AudioOutput/Descriptors.c
index
ba89b84
..
0c3873b
100644
(file)
--- a/
Demos/Device/AudioOutput/Descriptors.c
+++ b/
Demos/Device/AudioOutput/Descriptors.c
@@
-282,26
+282,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/CDC/Descriptors.c
b/Demos/Device/CDC/Descriptors.c
index
c147546
..
2ec482d
100644
(file)
--- a/
Demos/Device/CDC/Descriptors.c
+++ b/
Demos/Device/CDC/Descriptors.c
@@
-225,32
+225,32
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
const uint8_t DescriptorType = (wValue >> 8);
\r
const uint8_t DescriptorNumber = (wValue & 0xFF);
\r
\r
const uint8_t DescriptorType = (wValue >> 8);
\r
const uint8_t DescriptorNumber = (wValue & 0xFF);
\r
\r
- void* Address = NULL;
\r
- uint16_t Size = NO_DESCRIPTOR;
\r
+ void*
Address = NULL;
\r
+ uint16_t
Size = NO_DESCRIPTOR;
\r
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/DualCDC/Descriptors.c
b/Demos/Device/DualCDC/Descriptors.c
index
b128b4f
..
d9689f7
100644
(file)
--- a/
Demos/Device/DualCDC/Descriptors.c
+++ b/
Demos/Device/DualCDC/Descriptors.c
@@
-353,26
+353,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/GenericHID/Descriptors.c
b/Demos/Device/GenericHID/Descriptors.c
index
612450c
..
0eed6e9
100644
(file)
--- a/
Demos/Device/GenericHID/Descriptors.c
+++ b/
Demos/Device/GenericHID/Descriptors.c
@@
-210,37
+210,37
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.GenericHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.GenericHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(GenericReport)
;
\r
+ Address =
(void*)&GenericReport
;
\r
Size = sizeof(GenericReport);
\r
break;
\r
}
\r
Size = sizeof(GenericReport);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/Joystick/Descriptors.c
b/Demos/Device/Joystick/Descriptors.c
index
1bdce1c
..
7ab6d46
100644
(file)
--- a/
Demos/Device/Joystick/Descriptors.c
+++ b/
Demos/Device/Joystick/Descriptors.c
@@
-210,37
+210,37
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.JoystickHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.JoystickHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(JoystickReport)
;
\r
+ Address =
(void*)&JoystickReport
;
\r
Size = sizeof(JoystickReport);
\r
break;
\r
}
\r
Size = sizeof(JoystickReport);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/Keyboard/Descriptors.c
b/Demos/Device/Keyboard/Descriptors.c
index
02a5b7c
..
428a6a1
100644
(file)
--- a/
Demos/Device/Keyboard/Descriptors.c
+++ b/
Demos/Device/Keyboard/Descriptors.c
@@
-227,37
+227,37
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.KeyboardHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(KeyboardReport)
;
\r
+ Address =
(void*)&KeyboardReport
;
\r
Size = sizeof(KeyboardReport);
\r
break;
\r
}
\r
Size = sizeof(KeyboardReport);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/KeyboardMouse/Descriptors.c
b/Demos/Device/KeyboardMouse/Descriptors.c
index
2eb2c6e
..
6a9d75a
100644
(file)
--- a/
Demos/Device/KeyboardMouse/Descriptors.c
+++ b/
Demos/Device/KeyboardMouse/Descriptors.c
@@
-297,26
+297,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
@@
-325,24
+325,24
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
case DTYPE_HID:
\r
if (!(wIndex))
\r
{
\r
case DTYPE_HID:
\r
if (!(wIndex))
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.KeyboardHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
}
\r
else
\r
{
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
}
\r
else
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.MouseHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.MouseHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
}
\r
break;
\r
case DTYPE_Report:
\r
if (!(wIndex))
\r
{
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
}
\r
break;
\r
case DTYPE_Report:
\r
if (!(wIndex))
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(KeyboardReport)
;
\r
+ Address =
(void*)&KeyboardReport
;
\r
Size = sizeof(KeyboardReport);
\r
}
\r
else
\r
{
\r
Size = sizeof(KeyboardReport);
\r
}
\r
else
\r
{
\r
- Address =
DESCRIPTOR_ADDRESS(MouseReport)
;
\r
+ Address =
(void*)&MouseReport
;
\r
Size = sizeof(MouseReport);
\r
}
\r
\r
Size = sizeof(MouseReport);
\r
}
\r
\r
diff --git
a/Demos/Device/MIDI/Descriptors.c
b/Demos/Device/MIDI/Descriptors.c
index
51b54cd
..
d425411
100644
(file)
--- a/
Demos/Device/MIDI/Descriptors.c
+++ b/
Demos/Device/MIDI/Descriptors.c
@@
-293,26
+293,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/MassStorage/Descriptors.c
b/Demos/Device/MassStorage/Descriptors.c
index
dbb16d1
..
2351a0b
100644
(file)
--- a/
Demos/Device/MassStorage/Descriptors.c
+++ b/
Demos/Device/MassStorage/Descriptors.c
@@
-187,30
+187,30
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
case 0x03:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
case 0x03:
\r
- Address =
DESCRIPTOR_ADDRESS(SerialNumberString)
;
\r
+ Address =
(void*)&SerialNumberString
;
\r
Size = pgm_read_byte(&SerialNumberString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&SerialNumberString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/MassStorage/MassStorage.c
b/Demos/Device/MassStorage/MassStorage.c
index
c50ca3d
..
1da8930
100644
(file)
--- a/
Demos/Device/MassStorage/MassStorage.c
+++ b/
Demos/Device/MassStorage/MassStorage.c
@@
-249,6
+249,11
@@
TASK(USB_MassStorage)
/* Reset the data endpoint banks */
\r
Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
\r
Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
\r
/* Reset the data endpoint banks */
\r
Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
\r
Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
\r
+
\r
+ Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
\r
+ Endpoint_ClearStall();
\r
+ Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
\r
+ Endpoint_ClearStall();
\r
\r
/* Clear the abort transfer flag */
\r
IsMassStoreReset = false;
\r
\r
/* Clear the abort transfer flag */
\r
IsMassStoreReset = false;
\r
diff --git
a/Demos/Device/Mouse/Descriptors.c
b/Demos/Device/Mouse/Descriptors.c
index
1a2b22a
..
0a6cbde
100644
(file)
--- a/
Demos/Device/Mouse/Descriptors.c
+++ b/
Demos/Device/Mouse/Descriptors.c
@@
-210,37
+210,37
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.MouseHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.MouseHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(MouseReport)
;
\r
+ Address =
(void*)&MouseReport
;
\r
Size = sizeof(MouseReport);
\r
break;
\r
}
\r
Size = sizeof(MouseReport);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/RNDISEthernet/Descriptors.c
b/Demos/Device/RNDISEthernet/Descriptors.c
index
93281f1
..
dfa4ba1
100644
(file)
--- a/
Demos/Device/RNDISEthernet/Descriptors.c
+++ b/
Demos/Device/RNDISEthernet/Descriptors.c
@@
-231,26
+231,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/Device/USBtoSerial/Descriptors.c
b/Demos/Device/USBtoSerial/Descriptors.c
index
26ba2c7
..
d5ab8b7
100644
(file)
--- a/
Demos/Device/USBtoSerial/Descriptors.c
+++ b/
Demos/Device/USBtoSerial/Descriptors.c
@@
-231,26
+231,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/Demos/OTG/TestApp/Descriptors.c
b/Demos/OTG/TestApp/Descriptors.c
index
96a0704
..
965ffb1
100644
(file)
--- a/
Demos/OTG/TestApp/Descriptors.c
+++ b/
Demos/OTG/TestApp/Descriptors.c
@@
-155,26
+155,26
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
diff --git
a/LUFA/ChangeLog.txt
b/LUFA/ChangeLog.txt
index
303c465
..
c6d72cf
100644
(file)
--- a/
LUFA/ChangeLog.txt
+++ b/
LUFA/ChangeLog.txt
@@
-19,6
+19,7
@@
* interface is skipped
\r
* - Clarified the size of library tokens which accept integer values in the Compile Time Tokens page, values now use the smallest datatype
\r
* inside the library that is able to hold their defined value to save space
\r
* interface is skipped
\r
* - Clarified the size of library tokens which accept integer values in the Compile Time Tokens page, values now use the smallest datatype
\r
* inside the library that is able to hold their defined value to save space
\r
+ * - Removed DESCRIPTOR_ADDRESS() macro as it was largely supurflous and only served to obfuscate code
\r
*
\r
*
\r
* \section Sec_ChangeLog090510 Version 090510
\r
*
\r
*
\r
* \section Sec_ChangeLog090510 Version 090510
\r
diff --git
a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index
2de5058
..
390ac6b
100644
(file)
--- a/
LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/
LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@
-175,9
+175,6
@@
*/
\r
#define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4)
\r
\r
*/
\r
#define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4)
\r
\r
- /** Gives a void pointer to the specified descriptor (of any type). */
\r
- #define DESCRIPTOR_ADDRESS(Descriptor) ((void*)&Descriptor)
\r
-
\r
/* Events: */
\r
#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
\r
/** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor()
\r
/* Events: */
\r
#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
\r
/** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor()
\r
@@
-483,7
+480,7
@@
* otherwise zero for standard descriptors, or as defined in a class-specific
\r
* standards.
\r
* \param DescriptorAddress Pointer to the descriptor in memory. This should be set by the routine to
\r
* otherwise zero for standard descriptors, or as defined in a class-specific
\r
* standards.
\r
* \param DescriptorAddress Pointer to the descriptor in memory. This should be set by the routine to
\r
- * the
location of the descriptor, found by the \ref DESCRIPTOR_ADDRESS() macro
.
\r
+ * the
address of the descriptor
.
\r
*
\r
* \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.
\r
* If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to
\r
*
\r
* \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.
\r
* If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to
\r
diff --git
a/LUFA/MigrationInformation.txt
b/LUFA/MigrationInformation.txt
index
c1a2e3c
..
bd73749
100644
(file)
--- a/
LUFA/MigrationInformation.txt
+++ b/
LUFA/MigrationInformation.txt
@@
-17,6
+17,8
@@
* projects using interrupts on non-control endpoints should switch to polling. For control interrupts, the library can
\r
* manage the control endpoint via interrupts automatically by compiling with the INTERRUPT_CONTROL_ENDPOINT token defined.
\r
* - The Endpoint_ClearEndpointInterrupt() macro has been deleted and references to it should be removed.
\r
* projects using interrupts on non-control endpoints should switch to polling. For control interrupts, the library can
\r
* manage the control endpoint via interrupts automatically by compiling with the INTERRUPT_CONTROL_ENDPOINT token defined.
\r
* - The Endpoint_ClearEndpointInterrupt() macro has been deleted and references to it should be removed.
\r
+ * - The DESCRIPTOR_ADDRESS() macro has been removed. User applications should use normal casts to obtain a descriptor's memory
\r
+ * address.
\r
*
\r
* <b>Device Mode</b>
\r
* - Support for non-control data pipe interrupts has been dropped due to many issues in the implementation. All existing
\r
*
\r
* <b>Device Mode</b>
\r
* - Support for non-control data pipe interrupts has been dropped due to many issues in the implementation. All existing
\r
diff --git
a/Projects/Magstripe/Descriptors.c
b/Projects/Magstripe/Descriptors.c
index
dd6b3fb
..
3d9dd08
100644
(file)
--- a/
Projects/Magstripe/Descriptors.c
+++ b/
Projects/Magstripe/Descriptors.c
@@
-207,37
+207,37
@@
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
switch (DescriptorType)
\r
{
\r
case DTYPE_Device:
\r
- Address =
DESCRIPTOR_ADDRESS(DeviceDescriptor)
;
\r
+ Address =
(void*)&DeviceDescriptor
;
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
Size = sizeof(USB_Descriptor_Device_t);
\r
break;
\r
case DTYPE_Configuration:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor)
;
\r
+ Address =
(void*)&ConfigurationDescriptor
;
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
Size = sizeof(USB_Descriptor_Configuration_t);
\r
break;
\r
case DTYPE_String:
\r
switch (DescriptorNumber)
\r
{
\r
case 0x00:
\r
- Address =
DESCRIPTOR_ADDRESS(LanguageString)
;
\r
+ Address =
(void*)&LanguageString
;
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
Size = pgm_read_byte(&LanguageString.Header.Size);
\r
break;
\r
case 0x01:
\r
- Address =
DESCRIPTOR_ADDRESS(ManufacturerString)
;
\r
+ Address =
(void*)&ManufacturerString
;
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
Size = pgm_read_byte(&ManufacturerString.Header.Size);
\r
break;
\r
case 0x02:
\r
- Address =
DESCRIPTOR_ADDRESS(ProductString)
;
\r
+ Address =
(void*)&ProductString
;
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
Size = pgm_read_byte(&ProductString.Header.Size);
\r
break;
\r
}
\r
\r
break;
\r
case DTYPE_HID:
\r
- Address =
DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID)
;
\r
+ Address =
(void*)&ConfigurationDescriptor.KeyboardHID
;
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
Size = sizeof(USB_Descriptor_HID_t);
\r
break;
\r
case DTYPE_Report:
\r
- Address =
DESCRIPTOR_ADDRESS(KeyboardReport)
;
\r
+ Address =
(void*)&KeyboardReport
;
\r
Size = sizeof(KeyboardReport);
\r
break;
\r
}
\r
Size = sizeof(KeyboardReport);
\r
break;
\r
}
\r
projects / pub / USBasp.git / commitdiff