mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 12:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: usb_new_device return codes consistency

Browse Source 
This makes use of errno return codes for representing error codes in a unified
way.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
This commit is contained in:
Paul Kocialkowski 2015-04-04 15:12:27 +02:00 committed by Marek Vasut
parent f657087134
commit 5a80b3449b
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
common/usb.c
View File

@ -116,7 +116,7 @@ int usb_init(void)
if (controllers_initialized == 0) if (controllers_initialized == 0)
puts("USB error: all controllers failed lowlevel init\n"); puts("USB error: all controllers failed lowlevel init\n");
return usb_started ? 0 : -1; return usb_started ? 0 : -ENODEV;
} }
/****************************************************************************** /******************************************************************************
@ -186,7 +186,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
if ((timeout == 0) && (!asynch_allowed)) { if ((timeout == 0) && (!asynch_allowed)) {
/* request for a asynch control pipe is not allowed */ /* request for a asynch control pipe is not allowed */
return -1; return -EINVAL;
} }
/* set setup command */ /* set setup command */
@ -201,7 +201,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
dev->status = USB_ST_NOT_PROC; /*not yet processed */ dev->status = USB_ST_NOT_PROC; /*not yet processed */
if (submit_control_msg(dev, pipe, data, size, setup_packet) < 0) if (submit_control_msg(dev, pipe, data, size, setup_packet) < 0)
return -1; return -EIO;
if (timeout == 0) if (timeout == 0)
return (int)size; return (int)size;
@ -224,17 +224,17 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
* submits bulk message, and waits for completion. returns 0 if Ok or * submits bulk message, and waits for completion. returns 0 if Ok or
* -1 if Error. * negative if Error.
* synchronous behavior * synchronous behavior
*/ */
int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
void *data, int len, int *actual_length, int timeout) void *data, int len, int *actual_length, int timeout)
{ {
if (len < 0) if (len < 0)
return -1; return -EINVAL;
dev->status = USB_ST_NOT_PROC; /*not yet processed */ dev->status = USB_ST_NOT_PROC; /*not yet processed */
if (submit_bulk_msg(dev, pipe, data, len) < 0) if (submit_bulk_msg(dev, pipe, data, len) < 0)
return -1; return -EIO;
while (timeout--) { while (timeout--) {
if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC)) if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC))
break; break;
@ -244,7 +244,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
if (dev->status == 0) if (dev->status == 0)
return 0; return 0;
else else
return -1; return -EIO;
} }
@ -350,11 +350,11 @@ static int usb_parse_config(struct usb_device *dev,
if (head->bDescriptorType != USB_DT_CONFIG) { if (head->bDescriptorType != USB_DT_CONFIG) {
printf(" ERROR: NOT USB_CONFIG_DESC %x\n", printf(" ERROR: NOT USB_CONFIG_DESC %x\n",
head->bDescriptorType); head->bDescriptorType);
return -1; return -EINVAL;
} }
if (head->bLength != USB_DT_CONFIG_SIZE) { if (head->bLength != USB_DT_CONFIG_SIZE) {
printf("ERROR: Invalid USB CFG length (%d)\n", head->bLength); printf("ERROR: Invalid USB CFG length (%d)\n", head->bLength);
return -1; return -EINVAL;
} }
memcpy(&dev->config, head, USB_DT_CONFIG_SIZE); memcpy(&dev->config, head, USB_DT_CONFIG_SIZE);
dev->config.no_of_if = 0; dev->config.no_of_if = 0;
@ -383,7 +383,7 @@ static int usb_parse_config(struct usb_device *dev,
if (ifno >= USB_MAXINTERFACES) { if (ifno >= USB_MAXINTERFACES) {
puts("Too many USB interfaces!\n"); puts("Too many USB interfaces!\n");
/* try to go on with what we have */ /* try to go on with what we have */
return 1; return -EINVAL;
} }
if_desc = &dev->config.if_desc[ifno]; if_desc = &dev->config.if_desc[ifno];
dev->config.no_of_if++; dev->config.no_of_if++;
@ -421,7 +421,7 @@ static int usb_parse_config(struct usb_device *dev,
if (epno > USB_MAXENDPOINTS) { if (epno > USB_MAXENDPOINTS) {
printf("Interface %d has too many endpoints!\n", printf("Interface %d has too many endpoints!\n",
if_desc->desc.bInterfaceNumber); if_desc->desc.bInterfaceNumber);
return 1; return -EINVAL;
} }
/* found an endpoint */ /* found an endpoint */
if_desc->no_of_ep++; if_desc->no_of_ep++;
@ -459,7 +459,7 @@ static int usb_parse_config(struct usb_device *dev,
break; break;
default: default:
if (head->bLength == 0) if (head->bLength == 0)
return 1; return -EINVAL;
debug("unknown Description Type : %x\n", debug("unknown Description Type : %x\n",
head->bDescriptorType); head->bDescriptorType);
@ -479,7 +479,7 @@ static int usb_parse_config(struct usb_device *dev,
index += head->bLength; index += head->bLength;
head = (struct usb_descriptor_header *)&buffer[index]; head = (struct usb_descriptor_header *)&buffer[index];
} }
return 1; return 0;
} }
/*********************************************************************** /***********************************************************************
@ -546,14 +546,14 @@ int usb_get_configuration_no(struct usb_device *dev,
else else
printf("config descriptor too short " \ printf("config descriptor too short " \
"(expected %i, got %i)\n", 9, result); "(expected %i, got %i)\n", 9, result);
return -1; return -EIO;
} }
length = le16_to_cpu(config->wTotalLength); length = le16_to_cpu(config->wTotalLength);
if (length > USB_BUFSIZ) { if (length > USB_BUFSIZ) {
printf("%s: failed to get descriptor - too long: %d\n", printf("%s: failed to get descriptor - too long: %d\n",
__func__, length); __func__, length);
return -1; return -EIO;
} }
result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, length); result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, length);
@ -595,7 +595,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
} }
if (!if_face) { if (!if_face) {
printf("selecting invalid interface %d", interface); printf("selecting invalid interface %d", interface);
return -1; return -EINVAL;
} }
/* /*
* We should return now for devices with only one alternate setting. * We should return now for devices with only one alternate setting.
@ -634,7 +634,7 @@ static int usb_set_configuration(struct usb_device *dev, int configuration)
dev->toggle[1] = 0; dev->toggle[1] = 0;
return 0; return 0;
} else } else
return -1; return -EIO;
} }
/******************************************************************** /********************************************************************
@ -748,7 +748,7 @@ static int usb_string_sub(struct usb_device *dev, unsigned int langid,
} }
if (rc < 2) if (rc < 2)
rc = -1; rc = -EINVAL;
return rc; return rc;
} }
@ -767,7 +767,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
unsigned int u, idx; unsigned int u, idx;
if (size <= 0 || !buf || !index) if (size <= 0 || !buf || !index)
return -1; return -EINVAL;
buf[0] = 0; buf[0] = 0;
tbuf = &mybuf[0]; tbuf = &mybuf[0];
@ -777,10 +777,10 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
if (err < 0) { if (err < 0) {
debug("error getting string descriptor 0 " \ debug("error getting string descriptor 0 " \
"(error=%lx)\n", dev->status); "(error=%lx)\n", dev->status);
return -1; return -EIO;
} else if (tbuf[0] < 4) { } else if (tbuf[0] < 4) {
debug("string descriptor 0 too short\n"); debug("string descriptor 0 too short\n");
return -1; return -EIO;
} else { } else {
dev->have_langid = -1; dev->have_langid = -1;
dev->string_langid = tbuf[2] | (tbuf[3] << 8); dev->string_langid = tbuf[2] | (tbuf[3] << 8);
@ -893,7 +893,7 @@ int usb_new_device(struct usb_device *dev)
*/ */
if (usb_alloc_device(dev)) { if (usb_alloc_device(dev)) {
printf("Cannot allocate device context to get SLOT_ID\n"); printf("Cannot allocate device context to get SLOT_ID\n");
return -1; return -EINVAL;
} }
/* We still haven't set the Address yet */ /* We still haven't set the Address yet */
@ -915,7 +915,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 8) { if (err < 8) {
printf("\n USB device not responding, " \ printf("\n USB device not responding, " \
"giving up (status=%lX)\n", dev->status); "giving up (status=%lX)\n", dev->status);
return 1; return -EIO;
} }
memcpy(&dev->descriptor, tmpbuf, 8); memcpy(&dev->descriptor, tmpbuf, 8);
#else #else
@ -952,7 +952,7 @@ int usb_new_device(struct usb_device *dev)
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64); err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64);
if (err < 0) { if (err < 0) {
debug("usb_new_device: usb_get_descriptor() failed\n"); debug("usb_new_device: usb_get_descriptor() failed\n");
return 1; return -EIO;
} }
dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0; dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0;
@ -968,7 +968,7 @@ int usb_new_device(struct usb_device *dev)
err = hub_port_reset(dev->parent, dev->portnr - 1, &portstatus); err = hub_port_reset(dev->parent, dev->portnr - 1, &portstatus);
if (err < 0) { if (err < 0) {
printf("\n Couldn't reset port %i\n", dev->portnr); printf("\n Couldn't reset port %i\n", dev->portnr);
return 1; return -EIO;
} }
} else { } else {
usb_reset_root_port(); usb_reset_root_port();
@ -998,7 +998,7 @@ int usb_new_device(struct usb_device *dev)
if (err < 0) { if (err < 0) {
printf("\n USB device not accepting new address " \ printf("\n USB device not accepting new address " \
"(error=%lX)\n", dev->status); "(error=%lX)\n", dev->status);
return 1; return -EIO;
} }
mdelay(10); /* Let the SET_ADDRESS settle */ mdelay(10); /* Let the SET_ADDRESS settle */
@ -1014,7 +1014,7 @@ int usb_new_device(struct usb_device *dev)
else else
printf("USB device descriptor short read " \ printf("USB device descriptor short read " \
"(expected %i, got %i)\n", tmp, err); "(expected %i, got %i)\n", tmp, err);
return 1; return -EIO;
} }
memcpy(&dev->descriptor, tmpbuf, sizeof(dev->descriptor)); memcpy(&dev->descriptor, tmpbuf, sizeof(dev->descriptor));
/* correct le values */ /* correct le values */
@ -1028,7 +1028,7 @@ int usb_new_device(struct usb_device *dev)
printf("usb_new_device: Cannot read configuration, " \ printf("usb_new_device: Cannot read configuration, " \
"skipping device %04x:%04x\n", "skipping device %04x:%04x\n",
dev->descriptor.idVendor, dev->descriptor.idProduct); dev->descriptor.idVendor, dev->descriptor.idProduct);
return -1; return -EIO;
} }
usb_parse_config(dev, tmpbuf, 0); usb_parse_config(dev, tmpbuf, 0);
usb_set_maxpacket(dev); usb_set_maxpacket(dev);
@ -1036,7 +1036,7 @@ int usb_new_device(struct usb_device *dev)
if (usb_set_configuration(dev, dev->config.desc.bConfigurationValue)) { if (usb_set_configuration(dev, dev->config.desc.bConfigurationValue)) {
printf("failed to set default configuration " \ printf("failed to set default configuration " \
"len %d, status %lX\n", dev->act_len, dev->status); "len %d, status %lX\n", dev->act_len, dev->status);
return -1; return -EIO;
} }
debug("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n", debug("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
dev->descriptor.iManufacturer, dev->descriptor.iProduct, dev->descriptor.iManufacturer, dev->descriptor.iProduct,