aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/Joystick/Descriptors.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-05-22 05:23:00 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-05-22 05:23:00 +0000
commitd0806c817cbf0c1b5c5362d1577eac6075c94dfc (patch)
tree1be89ddcaeceee05a5f230bbeb5784ee4c85193b /Demos/Device/Joystick/Descriptors.c
parentb3a4d8512bcaf0feba16a3cbeeaabfcfeb9cf051 (diff)
downloadlufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.tar.gz
lufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.tar.bz2
lufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.zip
Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor, moved ConfigDescriptor.c/.h from the LUFA/Drivers/USB/Class/ directory to LUFA/Drivers/USB/HighLevel/ in preperation for the new USB class APIs.
Diffstat (limited to 'Demos/Device/Joystick/Descriptors.c')
-rw-r--r--Demos/Device/Joystick/Descriptors.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Demos/Device/Joystick/Descriptors.c b/Demos/Device/Joystick/Descriptors.c
index 7ab6d46d5..bd7be658a 100644
--- a/Demos/Device/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
@@ -199,7 +199,7 @@ USB_Descriptor_String_t PROGMEM ProductString =
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);