]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/usb.c
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / common / usb.c
index de312124bce84cabfde7d0eb860db46b8f4b4ca9..55fff5b1e8380c988baa7ceb89ab2a9e32aa0d76 100644 (file)
@@ -47,6 +47,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/processor.h>
+#include <linux/compiler.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <asm/4xx_pci.h>
 #endif
 
-#ifdef DEBUG
-#define USB_DEBUG      1
-#define USB_HUB_DEBUG  1
-#else
-#define USB_DEBUG      0
-#define USB_HUB_DEBUG  0
-#endif
-
-#define USB_PRINTF(fmt, args...)       debug_cond(USB_DEBUG, fmt, ##args)
-#define USB_HUB_PRINTF(fmt, args...)   debug_cond(USB_HUB_DEBUG, fmt, ##args)
-
 #define USB_BUFSIZ     512
 
 static struct usb_device usb_dev[USB_MAX_DEVICE];
 static int dev_index;
-static int running;
 static int asynch_allowed;
-static struct devrequest setup_packet;
 
 char usb_started; /* flag for the started/stopped USB status */
 
-/**********************************************************************
- * some forward declerations...
- */
-static void usb_scan_devices(void);
-
-static int usb_hub_probe(struct usb_device *dev, int ifnum);
-static void usb_hub_reset(void);
-static int hub_port_reset(struct usb_device *dev, int port,
-                         unsigned short *portstat);
-
-/***********************************************************************
- * wait_ms
- */
-
-inline void wait_ms(unsigned long ms)
-{
-       while (ms-- > 0)
-               udelay(1000);
-}
+#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+#endif
 
 /***************************************************************************
  * Init USB Device
  */
-
 int usb_init(void)
 {
-       int result;
+       void *ctrl;
+       struct usb_device *dev;
+       int i, start_index = 0;
 
-       running = 0;
        dev_index = 0;
        asynch_allowed = 1;
        usb_hub_reset();
+
+       /* first make all devices unknown */
+       for (i = 0; i < USB_MAX_DEVICE; i++) {
+               memset(&usb_dev[i], 0, sizeof(struct usb_device));
+               usb_dev[i].devnum = -1;
+       }
+
        /* init low_level USB */
-       printf("USB:   ");
-       result = usb_lowlevel_init();
-       /* if lowlevel init is OK, scan the bus for devices
-        * i.e. search HUBs and configure them */
-       if (result == 0) {
-               printf("scanning bus for devices... ");
-               running = 1;
-               usb_scan_devices();
+       for (i = 0; i < CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
+               /* init low_level USB */
+               printf("USB%d:   ", i);
+               if (usb_lowlevel_init(i, &ctrl)) {
+                       puts("lowlevel init failed\n");
+                       continue;
+               }
+               /*
+                * lowlevel init is OK, now scan the bus for devices
+                * i.e. search HUBs and configure them
+                */
+               start_index = dev_index;
+               printf("scanning bus %d for devices... ", i);
+               dev = usb_alloc_new_device(ctrl);
+               /*
+                * device 0 is always present
+                * (root hub, so let it analyze)
+                */
+               if (dev)
+                       usb_new_device(dev);
+
+               if (start_index == dev_index)
+                       puts("No USB Device found\n");
+               else
+                       printf("%d USB Device(s) found\n",
+                               dev_index - start_index);
+
                usb_started = 1;
-               return 0;
-       } else {
-               printf("Error, couldn't init Lowlevel part\n");
-               usb_started = 0;
+       }
+
+       debug("scan end\n");
+       /* if we were not able to find at least one working bus, bail out */
+       if (!usb_started) {
+               puts("USB error: all controllers failed lowlevel init\n");
                return -1;
        }
+
+       return 0;
 }
 
 /******************************************************************************
@@ -132,15 +134,20 @@ int usb_init(void)
  */
 int usb_stop(void)
 {
-       int res = 0;
+       int i;
 
        if (usb_started) {
                asynch_allowed = 1;
                usb_started = 0;
                usb_hub_reset();
-               res = usb_lowlevel_stop();
+
+               for (i = 0; i < CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
+                       if (usb_lowlevel_stop(i))
+                               printf("failed to stop USB controller %d\n", i);
+               }
        }
-       return res;
+
+       return 0;
 }
 
 /*
@@ -185,23 +192,26 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
                        unsigned short value, unsigned short index,
                        void *data, unsigned short size, int timeout)
 {
+       ALLOC_CACHE_ALIGN_BUFFER(struct devrequest, setup_packet, 1);
+
        if ((timeout == 0) && (!asynch_allowed)) {
                /* request for a asynch control pipe is not allowed */
                return -1;
        }
 
        /* set setup command */
-       setup_packet.requesttype = requesttype;
-       setup_packet.request = request;
-       setup_packet.value = cpu_to_le16(value);
-       setup_packet.index = cpu_to_le16(index);
-       setup_packet.length = cpu_to_le16(size);
-       USB_PRINTF("usb_control_msg: request: 0x%X, requesttype: 0x%X, " \
-                  "value 0x%X index 0x%X length 0x%X\n",
-                  request, requesttype, value, index, size);
+       setup_packet->requesttype = requesttype;
+       setup_packet->request = request;
+       setup_packet->value = cpu_to_le16(value);
+       setup_packet->index = cpu_to_le16(index);
+       setup_packet->length = cpu_to_le16(size);
+       debug("usb_control_msg: request: 0x%X, requesttype: 0x%X, " \
+             "value 0x%X index 0x%X length 0x%X\n",
+             request, requesttype, value, index, size);
        dev->status = USB_ST_NOT_PROC; /*not yet processed */
 
-       submit_control_msg(dev, pipe, data, size, &setup_packet);
+       if (submit_control_msg(dev, pipe, data, size, setup_packet) < 0)
+               return -1;
        if (timeout == 0)
                return (int)size;
 
@@ -213,7 +223,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
        while (timeout--) {
                if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC))
                        break;
-               wait_ms(1);
+               mdelay(1);
        }
        if (dev->status)
                return -1;
@@ -233,11 +243,12 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
        if (len < 0)
                return -1;
        dev->status = USB_ST_NOT_PROC; /*not yet processed */
-       submit_bulk_msg(dev, pipe, data, len);
+       if (submit_bulk_msg(dev, pipe, data, len) < 0)
+               return -1;
        while (timeout--) {
                if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC))
                        break;
-               wait_ms(1);
+               mdelay(1);
        }
        *actual_length = dev->act_len;
        if (dev->status == 0)
@@ -275,7 +286,7 @@ int usb_maxpacket(struct usb_device *dev, unsigned long pipe)
  *
  * NOTE: Similar behaviour was observed with GCC4.6 on ARMv5.
  */
-static void  __attribute__((noinline))
+static void noinline
 usb_set_maxpacket_ep(struct usb_device *dev, int if_idx, int ep_idx)
 {
        int b;
@@ -292,22 +303,22 @@ usb_set_maxpacket_ep(struct usb_device *dev, int if_idx, int ep_idx)
                /* Control => bidirectional */
                dev->epmaxpacketout[b] = ep_wMaxPacketSize;
                dev->epmaxpacketin[b] = ep_wMaxPacketSize;
-               USB_PRINTF("##Control EP epmaxpacketout/in[%d] = %d\n",
-                          b, dev->epmaxpacketin[b]);
+               debug("##Control EP epmaxpacketout/in[%d] = %d\n",
+                     b, dev->epmaxpacketin[b]);
        } else {
                if ((ep->bEndpointAddress & 0x80) == 0) {
                        /* OUT Endpoint */
                        if (ep_wMaxPacketSize > dev->epmaxpacketout[b]) {
                                dev->epmaxpacketout[b] = ep_wMaxPacketSize;
-                               USB_PRINTF("##EP epmaxpacketout[%d] = %d\n",
-                                          b, dev->epmaxpacketout[b]);
+                               debug("##EP epmaxpacketout[%d] = %d\n",
+                                     b, dev->epmaxpacketout[b]);
                        }
                } else {
                        /* IN Endpoint */
                        if (ep_wMaxPacketSize > dev->epmaxpacketin[b]) {
                                dev->epmaxpacketin[b] = ep_wMaxPacketSize;
-                               USB_PRINTF("##EP epmaxpacketin[%d] = %d\n",
-                                          b, dev->epmaxpacketin[b]);
+                               debug("##EP epmaxpacketin[%d] = %d\n",
+                                     b, dev->epmaxpacketin[b]);
                        }
                } /* if out */
        } /* if control */
@@ -336,8 +347,8 @@ static int usb_parse_config(struct usb_device *dev,
 {
        struct usb_descriptor_header *head;
        int index, ifno, epno, curr_if_num;
-       int i;
        u16 ep_wMaxPacketSize;
+       struct usb_interface *if_desc = NULL;
 
        ifno = -1;
        epno = -1;
@@ -365,23 +376,27 @@ static int usb_parse_config(struct usb_device *dev,
                             &buffer[index])->bInterfaceNumber != curr_if_num) {
                                /* this is a new interface, copy new desc */
                                ifno = dev->config.no_of_if;
+                               if_desc = &dev->config.if_desc[ifno];
                                dev->config.no_of_if++;
-                               memcpy(&dev->config.if_desc[ifno],
-                                       &buffer[index], buffer[index]);
-                               dev->config.if_desc[ifno].no_of_ep = 0;
-                               dev->config.if_desc[ifno].num_altsetting = 1;
+                               memcpy(if_desc, &buffer[index], buffer[index]);
+                               if_desc->no_of_ep = 0;
+                               if_desc->num_altsetting = 1;
                                curr_if_num =
-                                    dev->config.if_desc[ifno].desc.bInterfaceNumber;
+                                    if_desc->desc.bInterfaceNumber;
                        } else {
                                /* found alternate setting for the interface */
-                               dev->config.if_desc[ifno].num_altsetting++;
+                               if (ifno >= 0) {
+                                       if_desc = &dev->config.if_desc[ifno];
+                                       if_desc->num_altsetting++;
+                               }
                        }
                        break;
                case USB_DT_ENDPOINT:
                        epno = dev->config.if_desc[ifno].no_of_ep;
+                       if_desc = &dev->config.if_desc[ifno];
                        /* found an endpoint */
-                       dev->config.if_desc[ifno].no_of_ep++;
-                       memcpy(&dev->config.if_desc[ifno].ep_desc[epno],
+                       if_desc->no_of_ep++;
+                       memcpy(&if_desc->ep_desc[epno],
                                &buffer[index], buffer[index]);
                        ep_wMaxPacketSize = get_unaligned(&dev->config.\
                                                        if_desc[ifno].\
@@ -392,23 +407,30 @@ static int usb_parse_config(struct usb_device *dev,
                                        if_desc[ifno].\
                                        ep_desc[epno].\
                                        wMaxPacketSize);
-                       USB_PRINTF("if %d, ep %d\n", ifno, epno);
+                       debug("if %d, ep %d\n", ifno, epno);
+                       break;
+               case USB_DT_SS_ENDPOINT_COMP:
+                       if_desc = &dev->config.if_desc[ifno];
+                       memcpy(&if_desc->ss_ep_comp_desc[epno],
+                               &buffer[index], buffer[index]);
                        break;
                default:
                        if (head->bLength == 0)
                                return 1;
 
-                       USB_PRINTF("unknown Description Type : %x\n",
-                                  head->bDescriptorType);
+                       debug("unknown Description Type : %x\n",
+                             head->bDescriptorType);
 
+#ifdef DEBUG
                        {
-#ifdef USB_DEBUG
                                unsigned char *ch = (unsigned char *)head;
-#endif
+                               int i;
+
                                for (i = 0; i < head->bLength; i++)
-                                       USB_PRINTF("%02X ", *ch++);
-                               USB_PRINTF("\n\n\n");
+                                       debug("%02X ", *ch++);
+                               debug("\n\n\n");
                        }
+#endif
                        break;
                }
                index += head->bLength;
@@ -470,9 +492,9 @@ int usb_get_configuration_no(struct usb_device *dev,
 {
        int result;
        unsigned int tmp;
-       struct usb_configuration_descriptor *config;
+       struct usb_config_descriptor *config;
 
-       config = (struct usb_configuration_descriptor *)&buffer[0];
+       config = (struct usb_config_descriptor *)&buffer[0];
        result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, 9);
        if (result < 9) {
                if (result < 0)
@@ -486,14 +508,13 @@ int usb_get_configuration_no(struct usb_device *dev,
        tmp = le16_to_cpu(config->wTotalLength);
 
        if (tmp > USB_BUFSIZ) {
-               USB_PRINTF("usb_get_configuration_no: failed to get " \
-                          "descriptor - too long: %d\n", tmp);
+               printf("usb_get_configuration_no: failed to get " \
+                      "descriptor - too long: %d\n", tmp);
                return -1;
        }
 
        result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, tmp);
-       USB_PRINTF("get_conf_no %d Result %d, wLength %d\n",
-                  cfgno, result, tmp);
+       debug("get_conf_no %d Result %d, wLength %d\n", cfgno, result, tmp);
        return result;
 }
 
@@ -505,7 +526,7 @@ static int usb_set_address(struct usb_device *dev)
 {
        int res;
 
-       USB_PRINTF("set address %d\n", dev->devnum);
+       debug("set address %d\n", dev->devnum);
        res = usb_control_msg(dev, usb_snddefctrl(dev),
                                USB_REQ_SET_ADDRESS, 0,
                                (dev->devnum), 0,
@@ -557,7 +578,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 static int usb_set_configuration(struct usb_device *dev, int configuration)
 {
        int res;
-       USB_PRINTF("set configuration %d\n", configuration);
+       debug("set configuration %d\n", configuration);
        /* set setup command */
        res = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                                USB_REQ_SET_CONFIGURATION, 0,
@@ -695,7 +716,7 @@ static int usb_string_sub(struct usb_device *dev, unsigned int langid,
  */
 int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
 {
-       unsigned char mybuf[USB_BUFSIZ];
+       ALLOC_CACHE_ALIGN_BUFFER(unsigned char, mybuf, USB_BUFSIZ);
        unsigned char *tbuf;
        int err;
        unsigned int u, idx;
@@ -709,19 +730,19 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
        if (!dev->have_langid) {
                err = usb_string_sub(dev, 0, 0, tbuf);
                if (err < 0) {
-                       USB_PRINTF("error getting string descriptor 0 " \
-                                  "(error=%lx)\n", dev->status);
+                       debug("error getting string descriptor 0 " \
+                             "(error=%lx)\n", dev->status);
                        return -1;
                } else if (tbuf[0] < 4) {
-                       USB_PRINTF("string descriptor 0 too short\n");
+                       debug("string descriptor 0 too short\n");
                        return -1;
                } else {
                        dev->have_langid = -1;
                        dev->string_langid = tbuf[2] | (tbuf[3] << 8);
                                /* always use the first langid listed */
-                       USB_PRINTF("USB device number %d default " \
-                                  "language ID 0x%x\n",
-                                  dev->devnum, dev->string_langid);
+                       debug("USB device number %d default " \
+                             "language ID 0x%x\n",
+                             dev->devnum, dev->string_langid);
                }
        }
 
@@ -761,14 +782,13 @@ struct usb_device *usb_get_dev_index(int index)
                return &usb_dev[index];
 }
 
-
 /* returns a pointer of a new device structure or NULL, if
  * no device struct is available
  */
-static struct usb_device *usb_alloc_new_device(void)
+struct usb_device *usb_alloc_new_device(void *controller)
 {
        int i;
-       USB_PRINTF("New Device %d\n", dev_index);
+       debug("New Device %d\n", dev_index);
        if (dev_index == USB_MAX_DEVICE) {
                printf("ERROR, too many USB Devices, max=%d\n", USB_MAX_DEVICE);
                return NULL;
@@ -779,10 +799,23 @@ static struct usb_device *usb_alloc_new_device(void)
        for (i = 0; i < USB_MAXCHILDREN; i++)
                usb_dev[dev_index].children[i] = NULL;
        usb_dev[dev_index].parent = NULL;
+       usb_dev[dev_index].controller = controller;
        dev_index++;
        return &usb_dev[dev_index - 1];
 }
 
+/*
+ * Free the newly created device node.
+ * Called in error cases where configuring a newly attached
+ * device fails for some reason.
+ */
+void usb_free_device(void)
+{
+       dev_index--;
+       debug("Freeing device node: %d\n", dev_index);
+       memset(&usb_dev[dev_index], 0, sizeof(struct usb_device));
+       usb_dev[dev_index].devnum = -1;
+}
 
 /*
  * By the time we get here, the device has gotten a new device ID
@@ -791,11 +824,11 @@ static struct usb_device *usb_alloc_new_device(void)
  *
  * Returns 0 for success, != 0 for error.
  */
-static int usb_new_device(struct usb_device *dev)
+int usb_new_device(struct usb_device *dev)
 {
        int addr, err;
        int tmp;
-       unsigned char tmpbuf[USB_BUFSIZ];
+       ALLOC_CACHE_ALIGN_BUFFER(unsigned char, tmpbuf, USB_BUFSIZ);
 
        /* We still haven't set the Address yet */
        addr = dev->devnum;
@@ -812,12 +845,13 @@ static int usb_new_device(struct usb_device *dev)
        dev->epmaxpacketin[0] = 8;
        dev->epmaxpacketout[0] = 8;
 
-       err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8);
+       err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, tmpbuf, 8);
        if (err < 8) {
                printf("\n      USB device not responding, " \
                       "giving up (status=%lX)\n", dev->status);
                return 1;
        }
+       memcpy(&dev->descriptor, tmpbuf, 8);
 #else
        /* This is a Windows scheme of initialization sequence, with double
         * reset of the device (Linux uses the same sequence)
@@ -845,11 +879,16 @@ static int usb_new_device(struct usb_device *dev)
 
        err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64);
        if (err < 0) {
-               USB_PRINTF("usb_new_device: usb_get_descriptor() failed\n");
+               debug("usb_new_device: usb_get_descriptor() failed\n");
                return 1;
        }
 
        dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0;
+       /*
+        * Fetch the device class, driver can use this info
+        * to differentiate between HUB and DEVICE.
+        */
+       dev->descriptor.bDeviceClass = desc->bDeviceClass;
 
        /* find the port number we're at */
        if (parent) {
@@ -901,12 +940,12 @@ static int usb_new_device(struct usb_device *dev)
                return 1;
        }
 
-       wait_ms(10);    /* Let the SET_ADDRESS settle */
+       mdelay(10);     /* Let the SET_ADDRESS settle */
 
        tmp = sizeof(dev->descriptor);
 
        err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
-                                &dev->descriptor, sizeof(dev->descriptor));
+                                tmpbuf, sizeof(dev->descriptor));
        if (err < tmp) {
                if (err < 0)
                        printf("unable to get device descriptor (error=%d)\n",
@@ -916,14 +955,21 @@ static int usb_new_device(struct usb_device *dev)
                                "(expected %i, got %i)\n", tmp, err);
                return 1;
        }
+       memcpy(&dev->descriptor, tmpbuf, sizeof(dev->descriptor));
        /* correct le values */
        le16_to_cpus(&dev->descriptor.bcdUSB);
        le16_to_cpus(&dev->descriptor.idVendor);
        le16_to_cpus(&dev->descriptor.idProduct);
        le16_to_cpus(&dev->descriptor.bcdDevice);
        /* only support for one config for now */
-       usb_get_configuration_no(dev, &tmpbuf[0], 0);
-       usb_parse_config(dev, &tmpbuf[0], 0);
+       err = usb_get_configuration_no(dev, tmpbuf, 0);
+       if (err < 0) {
+               printf("usb_new_device: Cannot read configuration, " \
+                      "skipping device %04x:%04x\n",
+                      dev->descriptor.idVendor, dev->descriptor.idProduct);
+               return -1;
+       }
+       usb_parse_config(dev, tmpbuf, 0);
        usb_set_maxpacket(dev);
        /* we set the default configuration here */
        if (usb_set_configuration(dev, dev->config.desc.bConfigurationValue)) {
@@ -931,9 +977,9 @@ static int usb_new_device(struct usb_device *dev)
                        "len %d, status %lX\n", dev->act_len, dev->status);
                return -1;
        }
-       USB_PRINTF("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
-                  dev->descriptor.iManufacturer, dev->descriptor.iProduct,
-                  dev->descriptor.iSerialNumber);
+       debug("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
+             dev->descriptor.iManufacturer, dev->descriptor.iProduct,
+             dev->descriptor.iSerialNumber);
        memset(dev->mf, 0, sizeof(dev->mf));
        memset(dev->prod, 0, sizeof(dev->prod));
        memset(dev->serial, 0, sizeof(dev->serial));
@@ -946,460 +992,12 @@ static int usb_new_device(struct usb_device *dev)
        if (dev->descriptor.iSerialNumber)
                usb_string(dev, dev->descriptor.iSerialNumber,
                           dev->serial, sizeof(dev->serial));
-       USB_PRINTF("Manufacturer %s\n", dev->mf);
-       USB_PRINTF("Product      %s\n", dev->prod);
-       USB_PRINTF("SerialNumber %s\n", dev->serial);
+       debug("Manufacturer %s\n", dev->mf);
+       debug("Product      %s\n", dev->prod);
+       debug("SerialNumber %s\n", dev->serial);
        /* now prode if the device is a hub */
        usb_hub_probe(dev, 0);
        return 0;
 }
 
-/* build device Tree  */
-static void usb_scan_devices(void)
-{
-       int i;
-       struct usb_device *dev;
-
-       /* first make all devices unknown */
-       for (i = 0; i < USB_MAX_DEVICE; i++) {
-               memset(&usb_dev[i], 0, sizeof(struct usb_device));
-               usb_dev[i].devnum = -1;
-       }
-       dev_index = 0;
-       /* device 0 is always present (root hub, so let it analyze) */
-       dev = usb_alloc_new_device();
-       if (usb_new_device(dev))
-               printf("No USB Device found\n");
-       else
-               printf("%d USB Device(s) found\n", dev_index);
-       /* insert "driver" if possible */
-#ifdef CONFIG_USB_KEYBOARD
-       drv_usb_kbd_init();
-#endif
-       USB_PRINTF("scan end\n");
-}
-
-
-/****************************************************************************
- * HUB "Driver"
- * Probes device for being a hub and configurate it
- */
-
-static struct usb_hub_device hub_dev[USB_MAX_HUB];
-static int usb_hub_index;
-
-
-static int usb_get_hub_descriptor(struct usb_device *dev, void *data, int size)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-               USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
-               USB_DT_HUB << 8, 0, data, size, USB_CNTL_TIMEOUT);
-}
-
-static int usb_clear_hub_feature(struct usb_device *dev, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature,
-                               0, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_clear_port_feature(struct usb_device *dev, int port, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature,
-                               port, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_set_port_feature(struct usb_device *dev, int port, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_SET_FEATURE, USB_RT_PORT, feature,
-                               port, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_get_hub_status(struct usb_device *dev, void *data)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
-                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
-}
-
-static int usb_get_port_status(struct usb_device *dev, int port, void *data)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
-                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
-}
-
-
-static void usb_hub_power_on(struct usb_hub_device *hub)
-{
-       int i;
-       struct usb_device *dev;
-
-       dev = hub->pusb_dev;
-       /* Enable power to the ports */
-       USB_HUB_PRINTF("enabling power on all ports\n");
-       for (i = 0; i < dev->maxchild; i++) {
-               usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
-               USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
-               wait_ms(hub->desc.bPwrOn2PwrGood * 2);
-       }
-}
-
-static void usb_hub_reset(void)
-{
-       usb_hub_index = 0;
-}
-
-static struct usb_hub_device *usb_hub_allocate(void)
-{
-       if (usb_hub_index < USB_MAX_HUB)
-               return &hub_dev[usb_hub_index++];
-
-       printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
-       return NULL;
-}
-
-#define MAX_TRIES 5
-
-static inline char *portspeed(int portstatus)
-{
-       if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
-               return "480 Mb/s";
-       else if (portstatus & (1 << USB_PORT_FEAT_LOWSPEED))
-               return "1.5 Mb/s";
-       else
-               return "12 Mb/s";
-}
-
-static int hub_port_reset(struct usb_device *dev, int port,
-                       unsigned short *portstat)
-{
-       int tries;
-       struct usb_port_status portsts;
-       unsigned short portstatus, portchange;
-
-       USB_HUB_PRINTF("hub_port_reset: resetting port %d...\n", port);
-       for (tries = 0; tries < MAX_TRIES; tries++) {
-
-               usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
-               wait_ms(200);
-
-               if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
-                       USB_HUB_PRINTF("get_port_status failed status %lX\n",
-                                       dev->status);
-                       return -1;
-               }
-               portstatus = le16_to_cpu(portsts.wPortStatus);
-               portchange = le16_to_cpu(portsts.wPortChange);
-
-               USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
-                               portstatus, portchange,
-                               portspeed(portstatus));
-
-               USB_HUB_PRINTF("STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \
-                              "  USB_PORT_STAT_ENABLE %d\n",
-                       (portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0,
-                       (portstatus & USB_PORT_STAT_CONNECTION) ? 1 : 0,
-                       (portstatus & USB_PORT_STAT_ENABLE) ? 1 : 0);
-
-               if ((portchange & USB_PORT_STAT_C_CONNECTION) ||
-                   !(portstatus & USB_PORT_STAT_CONNECTION))
-                       return -1;
-
-               if (portstatus & USB_PORT_STAT_ENABLE)
-                       break;
-
-               wait_ms(200);
-       }
-
-       if (tries == MAX_TRIES) {
-               USB_HUB_PRINTF("Cannot enable port %i after %i retries, " \
-                               "disabling port.\n", port + 1, MAX_TRIES);
-               USB_HUB_PRINTF("Maybe the USB cable is bad?\n");
-               return -1;
-       }
-
-       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_RESET);
-       *portstat = portstatus;
-       return 0;
-}
-
-
-void usb_hub_port_connect_change(struct usb_device *dev, int port)
-{
-       struct usb_device *usb;
-       struct usb_port_status portsts;
-       unsigned short portstatus;
-
-       /* Check status */
-       if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
-               USB_HUB_PRINTF("get_port_status failed\n");
-               return;
-       }
-
-       portstatus = le16_to_cpu(portsts.wPortStatus);
-       USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
-                       portstatus,
-                       le16_to_cpu(portsts.wPortChange),
-                       portspeed(portstatus));
-
-       /* Clear the connection change status */
-       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_CONNECTION);
-
-       /* Disconnect any existing devices under this port */
-       if (((!(portstatus & USB_PORT_STAT_CONNECTION)) &&
-            (!(portstatus & USB_PORT_STAT_ENABLE))) || (dev->children[port])) {
-               USB_HUB_PRINTF("usb_disconnect(&hub->children[port]);\n");
-               /* Return now if nothing is connected */
-               if (!(portstatus & USB_PORT_STAT_CONNECTION))
-                       return;
-       }
-       wait_ms(200);
-
-       /* Reset the port */
-       if (hub_port_reset(dev, port, &portstatus) < 0) {
-               printf("cannot reset port %i!?\n", port + 1);
-               return;
-       }
-
-       wait_ms(200);
-
-       /* Allocate a new device struct for it */
-       usb = usb_alloc_new_device();
-
-       if (portstatus & USB_PORT_STAT_HIGH_SPEED)
-               usb->speed = USB_SPEED_HIGH;
-       else if (portstatus & USB_PORT_STAT_LOW_SPEED)
-               usb->speed = USB_SPEED_LOW;
-       else
-               usb->speed = USB_SPEED_FULL;
-
-       dev->children[port] = usb;
-       usb->parent = dev;
-       usb->portnr = port + 1;
-       /* Run it through the hoops (find a driver, etc) */
-       if (usb_new_device(usb)) {
-               /* Woops, disable the port */
-               USB_HUB_PRINTF("hub: disabling port %d\n", port + 1);
-               usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
-       }
-}
-
-
-static int usb_hub_configure(struct usb_device *dev)
-{
-       int i;
-       unsigned char buffer[USB_BUFSIZ], *bitmap;
-       struct usb_hub_descriptor *descriptor;
-       struct usb_hub_device *hub;
-#ifdef USB_HUB_DEBUG
-       struct usb_hub_status *hubsts;
-#endif
-
-       /* "allocate" Hub device */
-       hub = usb_hub_allocate();
-       if (hub == NULL)
-               return -1;
-       hub->pusb_dev = dev;
-       /* Get the the hub descriptor */
-       if (usb_get_hub_descriptor(dev, buffer, 4) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                                  "descriptor, giving up %lX\n", dev->status);
-               return -1;
-       }
-       descriptor = (struct usb_hub_descriptor *)buffer;
-
-       /* silence compiler warning if USB_BUFSIZ is > 256 [= sizeof(char)] */
-       i = descriptor->bLength;
-       if (i > USB_BUFSIZ) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                               "descriptor - too long: %d\n",
-                               descriptor->bLength);
-               return -1;
-       }
-
-       if (usb_get_hub_descriptor(dev, buffer, descriptor->bLength) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                               "descriptor 2nd giving up %lX\n", dev->status);
-               return -1;
-       }
-       memcpy((unsigned char *)&hub->desc, buffer, descriptor->bLength);
-       /* adjust 16bit values */
-       hub->desc.wHubCharacteristics =
-                               le16_to_cpu(descriptor->wHubCharacteristics);
-       /* set the bitmap */
-       bitmap = (unsigned char *)&hub->desc.DeviceRemovable[0];
-       /* devices not removable by default */
-       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8);
-       bitmap = (unsigned char *)&hub->desc.PortPowerCtrlMask[0];
-       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8); /* PowerMask = 1B */
-
-       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
-               hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i];
-
-       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
-               hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i];
-
-       dev->maxchild = descriptor->bNbrPorts;
-       USB_HUB_PRINTF("%d ports detected\n", dev->maxchild);
-
-       switch (hub->desc.wHubCharacteristics & HUB_CHAR_LPSM) {
-       case 0x00:
-               USB_HUB_PRINTF("ganged power switching\n");
-               break;
-       case 0x01:
-               USB_HUB_PRINTF("individual port power switching\n");
-               break;
-       case 0x02:
-       case 0x03:
-               USB_HUB_PRINTF("unknown reserved power switching mode\n");
-               break;
-       }
-
-       if (hub->desc.wHubCharacteristics & HUB_CHAR_COMPOUND)
-               USB_HUB_PRINTF("part of a compound device\n");
-       else
-               USB_HUB_PRINTF("standalone hub\n");
-
-       switch (hub->desc.wHubCharacteristics & HUB_CHAR_OCPM) {
-       case 0x00:
-               USB_HUB_PRINTF("global over-current protection\n");
-               break;
-       case 0x08:
-               USB_HUB_PRINTF("individual port over-current protection\n");
-               break;
-       case 0x10:
-       case 0x18:
-               USB_HUB_PRINTF("no over-current protection\n");
-               break;
-       }
-
-       USB_HUB_PRINTF("power on to power good time: %dms\n",
-                       descriptor->bPwrOn2PwrGood * 2);
-       USB_HUB_PRINTF("hub controller current requirement: %dmA\n",
-                       descriptor->bHubContrCurrent);
-
-       for (i = 0; i < dev->maxchild; i++)
-               USB_HUB_PRINTF("port %d is%s removable\n", i + 1,
-                       hub->desc.DeviceRemovable[(i + 1) / 8] & \
-                                          (1 << ((i + 1) % 8)) ? " not" : "");
-
-       if (sizeof(struct usb_hub_status) > USB_BUFSIZ) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get Status - " \
-                               "too long: %d\n", descriptor->bLength);
-               return -1;
-       }
-
-       if (usb_get_hub_status(dev, buffer) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get Status %lX\n",
-                               dev->status);
-               return -1;
-       }
-
-#ifdef USB_HUB_DEBUG
-       hubsts = (struct usb_hub_status *)buffer;
-#endif
-       USB_HUB_PRINTF("get_hub_status returned status %X, change %X\n",
-                       le16_to_cpu(hubsts->wHubStatus),
-                       le16_to_cpu(hubsts->wHubChange));
-       USB_HUB_PRINTF("local power source is %s\n",
-               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_LOCAL_POWER) ? \
-               "lost (inactive)" : "good");
-       USB_HUB_PRINTF("%sover-current condition exists\n",
-               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
-               "" : "no ");
-       usb_hub_power_on(hub);
-
-       for (i = 0; i < dev->maxchild; i++) {
-               struct usb_port_status portsts;
-               unsigned short portstatus, portchange;
-
-               if (usb_get_port_status(dev, i + 1, &portsts) < 0) {
-                       USB_HUB_PRINTF("get_port_status failed\n");
-                       continue;
-               }
-
-               portstatus = le16_to_cpu(portsts.wPortStatus);
-               portchange = le16_to_cpu(portsts.wPortChange);
-               USB_HUB_PRINTF("Port %d Status %X Change %X\n",
-                               i + 1, portstatus, portchange);
-
-               if (portchange & USB_PORT_STAT_C_CONNECTION) {
-                       USB_HUB_PRINTF("port %d connection change\n", i + 1);
-                       usb_hub_port_connect_change(dev, i);
-               }
-               if (portchange & USB_PORT_STAT_C_ENABLE) {
-                       USB_HUB_PRINTF("port %d enable change, status %x\n",
-                                       i + 1, portstatus);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_C_ENABLE);
-
-                       /* EM interference sometimes causes bad shielded USB
-                        * devices to be shutdown by the hub, this hack enables
-                        * them again. Works at least with mouse driver */
-                       if (!(portstatus & USB_PORT_STAT_ENABLE) &&
-                            (portstatus & USB_PORT_STAT_CONNECTION) &&
-                            ((dev->children[i]))) {
-                               USB_HUB_PRINTF("already running port %i "  \
-                                               "disabled by hub (EMI?), " \
-                                               "re-enabling...\n", i + 1);
-                                       usb_hub_port_connect_change(dev, i);
-                       }
-               }
-               if (portstatus & USB_PORT_STAT_SUSPEND) {
-                       USB_HUB_PRINTF("port %d suspend change\n", i + 1);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_SUSPEND);
-               }
-
-               if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
-                       USB_HUB_PRINTF("port %d over-current change\n", i + 1);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_C_OVER_CURRENT);
-                       usb_hub_power_on(hub);
-               }
-
-               if (portchange & USB_PORT_STAT_C_RESET) {
-                       USB_HUB_PRINTF("port %d reset change\n", i + 1);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_C_RESET);
-               }
-       } /* end for i all ports */
-
-       return 0;
-}
-
-static int usb_hub_probe(struct usb_device *dev, int ifnum)
-{
-       struct usb_interface *iface;
-       struct usb_endpoint_descriptor *ep;
-       int ret;
-
-       iface = &dev->config.if_desc[ifnum];
-       /* Is it a hub? */
-       if (iface->desc.bInterfaceClass != USB_CLASS_HUB)
-               return 0;
-       /* Some hubs have a subclass of 1, which AFAICT according to the */
-       /*  specs is not defined, but it works */
-       if ((iface->desc.bInterfaceSubClass != 0) &&
-           (iface->desc.bInterfaceSubClass != 1))
-               return 0;
-       /* Multiple endpoints? What kind of mutant ninja-hub is this? */
-       if (iface->desc.bNumEndpoints != 1)
-               return 0;
-       ep = &iface->ep_desc[0];
-       /* Output endpoint? Curiousier and curiousier.. */
-       if (!(ep->bEndpointAddress & USB_DIR_IN))
-               return 0;
-       /* If it's not an interrupt endpoint, we'd better punt! */
-       if ((ep->bmAttributes & 3) != 3)
-               return 0;
-       /* We found a hub */
-       USB_HUB_PRINTF("USB hub found\n");
-       ret = usb_hub_configure(dev);
-       return ret;
-}
-
 /* EOF */