forked from len0rd/rockbox
only send a Charging Only interface if nothing else is sent
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16499 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
a9afca99a8
commit
c270b7a289
1 changed files with 8 additions and 8 deletions
|
|
@ -631,14 +631,6 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
|
|||
}
|
||||
size = sizeof(struct usb_config_descriptor);
|
||||
|
||||
#ifdef USB_CHARGING_ONLY
|
||||
if(usb_core_charging_enabled){
|
||||
charging_interface_descriptor.bInterfaceNumber=interface_number;
|
||||
interface_number++;
|
||||
memcpy(&response_data[size],&charging_interface_descriptor,sizeof(struct usb_interface_descriptor));
|
||||
size += sizeof(struct usb_interface_descriptor);
|
||||
}
|
||||
#endif
|
||||
#ifdef USB_STORAGE
|
||||
if(usb_core_storage_enabled){
|
||||
mass_storage_ep_in_descriptor.wMaxPacketSize=max_packet_size;
|
||||
|
|
@ -681,6 +673,14 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
|
|||
memcpy(&response_data[size],&benchmark_ep_out_descriptor,sizeof(struct usb_endpoint_descriptor));
|
||||
size += sizeof(struct usb_endpoint_descriptor);
|
||||
}
|
||||
#endif
|
||||
#ifdef USB_CHARGING_ONLY
|
||||
if(usb_core_charging_enabled && interface_number == 0){
|
||||
charging_interface_descriptor.bInterfaceNumber=interface_number;
|
||||
interface_number++;
|
||||
memcpy(&response_data[size],&charging_interface_descriptor,sizeof(struct usb_interface_descriptor));
|
||||
size += sizeof(struct usb_interface_descriptor);
|
||||
}
|
||||
#endif
|
||||
config_descriptor.bNumInterfaces=interface_number;
|
||||
config_descriptor.wTotalLength = size;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue