diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-29 21:58:34 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-29 21:58:34 +0000 |
commit | 4c2126b5a8b0bea04d4c5ba8bee032f9bc0efbe0 (patch) | |
tree | e98a32588e3919908590b3c9ddac89dbc24caea3 /firmware/usbstack/usb_hid.c | |
parent | 6a6269ffd8dfaf921588bae47cd55716abb78abb (diff) | |
download | rockbox-4c2126b5a8b0bea04d4c5ba8bee032f9bc0efbe0.tar.gz rockbox-4c2126b5a8b0bea04d4c5ba8bee032f9bc0efbe0.zip |
usb PACK_DATA: use a static inline to enable type checking
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31467 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack/usb_hid.c')
-rw-r--r-- | firmware/usbstack/usb_hid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/usbstack/usb_hid.c b/firmware/usbstack/usb_hid.c index b89e46f291..ed0816395a 100644 --- a/firmware/usbstack/usb_hid.c +++ b/firmware/usbstack/usb_hid.c | |||
@@ -561,7 +561,7 @@ static void descriptor_hid_get(unsigned char **dest) | |||
561 | logf("hid: desc len %u", hid_descriptor.wDescriptorLength0); | 561 | logf("hid: desc len %u", hid_descriptor.wDescriptorLength0); |
562 | buf_dump(report_descriptor, hid_descriptor.wDescriptorLength0, "desc"); | 562 | buf_dump(report_descriptor, hid_descriptor.wDescriptorLength0, "desc"); |
563 | 563 | ||
564 | PACK_DATA(*dest, hid_descriptor); | 564 | PACK_DATA(dest, hid_descriptor); |
565 | } | 565 | } |
566 | 566 | ||
567 | int usb_hid_get_config_descriptor(unsigned char *dest, int max_packet_size) | 567 | int usb_hid_get_config_descriptor(unsigned char *dest, int max_packet_size) |
@@ -574,7 +574,7 @@ int usb_hid_get_config_descriptor(unsigned char *dest, int max_packet_size) | |||
574 | 574 | ||
575 | /* Interface descriptor */ | 575 | /* Interface descriptor */ |
576 | interface_descriptor.bInterfaceNumber = usb_interface; | 576 | interface_descriptor.bInterfaceNumber = usb_interface; |
577 | PACK_DATA(dest, interface_descriptor); | 577 | PACK_DATA(&dest, interface_descriptor); |
578 | 578 | ||
579 | /* HID descriptor */ | 579 | /* HID descriptor */ |
580 | descriptor_hid_get(&dest); | 580 | descriptor_hid_get(&dest); |
@@ -583,7 +583,7 @@ int usb_hid_get_config_descriptor(unsigned char *dest, int max_packet_size) | |||
583 | endpoint_descriptor.wMaxPacketSize = 8; | 583 | endpoint_descriptor.wMaxPacketSize = 8; |
584 | endpoint_descriptor.bInterval = 8; | 584 | endpoint_descriptor.bInterval = 8; |
585 | endpoint_descriptor.bEndpointAddress = ep_in; | 585 | endpoint_descriptor.bEndpointAddress = ep_in; |
586 | PACK_DATA(dest, endpoint_descriptor); | 586 | PACK_DATA(&dest, endpoint_descriptor); |
587 | 587 | ||
588 | return (int)(dest - orig_dest); | 588 | return (int)(dest - orig_dest); |
589 | } | 589 | } |