Re: [U-Boot-Users] [PATCH] fix USB devices with multiple configurations
On 00:11 Thu 10 Jul , Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: This patch fixes bugs in usbdcore*.c related to the use of devices with multiple configurations. The original code made mistakes about the meaning of configuration value and configuration index, and the resulting off-by-one errors resulted in: * SET_CONFIGURATION always selected the first configuration, no matter what wValue is being passed. * GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first configuration (index 0). Signed-off-by: Harald Welte [EMAIL PROTECTED] Markus, are you going to add this to the USB repo any time soon? Or you could just ACK it (if you think so) and tell me to pick up directly. Any news about this patch? Best Regards, J. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] fix USB devices with multiple configurations
Wolfgang Denk [EMAIL PROTECTED] writes: In message [EMAIL PROTECTED] you wrote: This patch fixes bugs in usbdcore*.c related to the use of devices with multiple configurations. The original code made mistakes about the meaning of configuration value and configuration index, and the resulting off-by-one errors resulted in: * SET_CONFIGURATION always selected the first configuration, no matter what wValue is being passed. * GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first configuration (index 0). Signed-off-by: Harald Welte [EMAIL PROTECTED] Acked-by: Markus Klotzbuecher [EMAIL PROTECTED] Markus, are you going to add this to the USB repo any time soon? Or you could just ACK it (if you think so) and tell me to pick up directly. Wolfgang, please apply. Sorry for the delay. Best regards Markus Klotzbuecher -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] fix USB devices with multiple configurations
In message [EMAIL PROTECTED] you wrote: Acked-by: Markus Klotzbuecher [EMAIL PROTECTED] thanks. Wolfgang, please apply. Done, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] We're all sorry for the other guy when he loses his job to a machine. But when it comes to your job -- that's different. And it always will be different. -- McCoy, The Ultimate Computer, stardate 4729.4 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] fix USB devices with multiple configurations
In message [EMAIL PROTECTED] you wrote: This patch fixes bugs in usbdcore*.c related to the use of devices with multiple configurations. The original code made mistakes about the meaning of configuration value and configuration index, and the resulting off-by-one errors resulted in: * SET_CONFIGURATION always selected the first configuration, no matter what wValue is being passed. * GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first configuration (index 0). Signed-off-by: Harald Welte [EMAIL PROTECTED] Markus, are you going to add this to the USB repo any time soon? Or you could just ACK it (if you think so) and tell me to pick up directly. Thanks in advance. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] It's all Klatchian to me. - Terry Pratchett Stephen Briggs, _The Discworld Companion_ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] fix USB devices with multiple configurations
This patch fixes bugs in usbdcore*.c related to the use of devices
with multiple configurations.
The original code made mistakes about the meaning of configuration value and
configuration index, and the resulting off-by-one errors resulted in:
* SET_CONFIGURATION always selected the first configuration, no matter what
wValue is being passed.
* GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first
configuration (index 0).
Signed-off-by: Harald Welte [EMAIL PROTECTED]
diff --git a/drivers/usb/usbdcore.c b/drivers/usb/usbdcore.c
index 65a5724..a2e6711 100644
--- a/drivers/usb/usbdcore.c
+++ b/drivers/usb/usbdcore.c
@@ -147,12 +147,9 @@ struct usb_string_descriptor *usbd_get_string (__u8 index)
static struct usb_configuration_instance *usbd_device_configuration_instance
(struct usb_device_instance *device,
unsigned int port, unsigned int configuration)
{
- /* XXX */
- configuration = configuration ? configuration - 1 : 0;
-
- if (configuration = device-configurations) {
+ if (configuration = device-configurations)
return NULL;
- }
+
return device-configuration_instance_array + configuration;
}
diff --git a/drivers/usb/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c
index 2c89304..d9808f9 100644
--- a/drivers/usb/usbdcore_ep0.c
+++ b/drivers/usb/usbdcore_ep0.c
@@ -237,8 +237,8 @@ static int ep0_get_descriptor (struct usb_device_instance
*device,
return -1;
}
/*dbg_ep0(2, %d %d, index,
device_descriptor-bNumConfigurations); */
- if (index device_descriptor-bNumConfigurations) {
- dbg_ep0 (0, index too large: %d %d, index,
+ if (index = device_descriptor-bNumConfigurations) {
+ dbg_ep0 (0, index too large: %d = %d, index,
device_descriptor-
bNumConfigurations);
return -1;
@@ -612,14 +612,8 @@ int ep0_recv_setup (struct urb *urb)
case USB_REQ_SET_CONFIGURATION:
/* c.f. 9.4.7 - the top half of wValue is reserved */
- /* */
- if ((device-configuration =
- le16_to_cpu (request-wValue) 0xFF80) != 0) {
- /* c.f. 9.4.7 - zero is the default or
addressed state, in our case this */
- /* is the same is configuration zero */
- serial_printf(error setting dev-config to
zero!\n);
- device-configuration = 0; /* TBR - ??
*/
- }
+ device-configuration = le16_to_cpu(request-wValue)
0xff;
+
/* reset interface and alternate settings */
device-interface = device-alternate = 0;
--
- Harald Welte [EMAIL PROTECTED] http://laforge.gnumonks.org/
Privacy in residential applications is a desirable marketing option.
(ETSI EN 300 175-7 Ch. A6)
signature.asc
Description: Digital signature
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
