summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-03-02 18:53:52 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-03-02 18:53:52 +0000
commitb3ab7884110b6e3849add5573d1f2a96c7603cd4 (patch)
treeef9c037d207097f68fa04069f9a42bde1b279225
parent411b92948a7bb8f28afae546ffe5ad4ae61c4cf1 (diff)
downloadrockbox-b3ab7884110b6e3849add5573d1f2a96c7603cd4.tar.gz
rockbox-b3ab7884110b6e3849add5573d1f2a96c7603cd4.zip
update the bNumInterfaces field in the configuration descriptor correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16485 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/usbstack/usb_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index f40d76bee0..60a88e9490 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -657,7 +657,6 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
657 if(usb_core_benchmark_enabled){ 657 if(usb_core_benchmark_enabled){
658 benchmark_ep_in_descriptor.wMaxPacketSize=max_packet_size; 658 benchmark_ep_in_descriptor.wMaxPacketSize=max_packet_size;
659 benchmark_ep_out_descriptor.wMaxPacketSize=max_packet_size; 659 benchmark_ep_out_descriptor.wMaxPacketSize=max_packet_size;
660 config_descriptor.bNumInterfaces=interface_number;
661 660
662 memcpy(&response_data[size],&benchmark_interface_descriptor,sizeof(struct usb_interface_descriptor)); 661 memcpy(&response_data[size],&benchmark_interface_descriptor,sizeof(struct usb_interface_descriptor));
663 size += sizeof(struct usb_interface_descriptor); 662 size += sizeof(struct usb_interface_descriptor);
@@ -667,6 +666,7 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
667 size += sizeof(struct usb_endpoint_descriptor); 666 size += sizeof(struct usb_endpoint_descriptor);
668 } 667 }
669#endif 668#endif
669 config_descriptor.bNumInterfaces=interface_number;
670 config_descriptor.wTotalLength = size; 670 config_descriptor.wTotalLength = size;
671 memcpy(&response_data[0],&config_descriptor,sizeof(struct usb_config_descriptor)); 671 memcpy(&response_data[0],&config_descriptor,sizeof(struct usb_config_descriptor));
672 672