projects / oweals / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git] / drivers / usb / gadget / ether.c
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f1b070982190362afbccfb9b55f6274e5abdf2b9..a80486e91f1a7ba4a79d2ff58b94f2f956192515 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -273,8 +273,8 @@ static inline int BITRATE(struct usb_gadget *g)
  * static ushort idProduct;
  */
 
-#if defined(CONFIG_USBNET_MANUFACTURER)
-static char *iManufacturer = CONFIG_USBNET_MANUFACTURER;
+#if defined(CONFIG_USB_GADGET_MANUFACTURER)
+static char *iManufacturer = CONFIG_USB_GADGET_MANUFACTURER;
 #else
 static char *iManufacturer = "U-Boot";
 #endif
@@ -507,6 +507,7 @@ static const struct usb_cdc_mdlm_desc mdlm_desc = {
  * can't really use its struct.  All we do here is say that we're using
  * the submode of "SAFE" which directly matches the CDC Subset.
  */
+#ifdef CONFIG_USB_ETH_SUBSET
 static const u8 mdlm_detail_desc[] = {
        6,
        USB_DT_CS_INTERFACE,
@@ -516,6 +517,7 @@ static const u8 mdlm_detail_desc[] = {
        0,      /* network control capabilities (none) */
        0,      /* network data capabilities ("raw" encapsulation) */
 };
+#endif
 
 #endif
 
@@ -1057,7 +1059,7 @@ static int eth_set_config(struct eth_dev *dev, unsigned number,
                        && dev->config
                        && dev->tx_qlen != 0) {
                /* tx fifo is full, but we can't clear it...*/
-               error("can't change configurations");
+               pr_err("can't change configurations");
                return -ESPIPE;
        }
        eth_reset_config(dev);
@@ -1231,7 +1233,7 @@ static void rndis_command_complete(struct usb_ep *ep, struct usb_request *req)
        /* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */
        status = rndis_msg_parser(dev->rndis_config, (u8 *) req->buf);
        if (status < 0)
-               error("%s: rndis parse error %d", __func__, status);
+               pr_err("%s: rndis parse error %d", __func__, status);
 }
 
 #endif /* RNDIS */
@@ -1552,7 +1554,7 @@ static int rx_submit(struct eth_dev *dev, struct usb_request *req,
        retval = usb_ep_queue(dev->out_ep, req, gfp_flags);
 
        if (retval)
-               error("rx submit --> %d", retval);
+               pr_err("rx submit --> %d", retval);
 
        return retval;
 }
@@ -1622,7 +1624,7 @@ static int alloc_requests(struct eth_dev *dev, unsigned n, gfp_t gfp_flags)
 fail2:
        usb_ep_free_request(dev->in_ep, dev->tx_req);
 fail1:
-       error("can't alloc requests");
+       pr_err("can't alloc requests");
        return -1;
 }
 
@@ -2058,7 +2060,7 @@ static int eth_bind(struct usb_gadget *gadget)
                 * anything less functional on CDC-capable hardware,
                 * so we fail in this case.
                 */
-               error("controller '%s' not recognized",
+               pr_err("controller '%s' not recognized",
                        gadget->name);
                return -ENODEV;
        }
@@ -2071,11 +2073,11 @@ static int eth_bind(struct usb_gadget *gadget)
         * to choose the right configuration otherwise.
         */
        if (rndis) {
-#if defined(CONFIG_USB_RNDIS_VENDOR_ID) && defined(CONFIG_USB_RNDIS_PRODUCT_ID)
+#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
                device_desc.idVendor =
-                       __constant_cpu_to_le16(CONFIG_USB_RNDIS_VENDOR_ID);
+                       __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
                device_desc.idProduct =
-                       __constant_cpu_to_le16(CONFIG_USB_RNDIS_PRODUCT_ID);
+                       __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
 #else
                device_desc.idVendor =
                        __constant_cpu_to_le16(RNDIS_VENDOR_NUM);
@@ -2090,9 +2092,9 @@ static int eth_bind(struct usb_gadget *gadget)
         * supporting one submode of the "SAFE" variant of MDLM.)
         */
        } else {
-#if defined(CONFIG_USB_CDC_VENDOR_ID) && defined(CONFIG_USB_CDC_PRODUCT_ID)
-               device_desc.idVendor = cpu_to_le16(CONFIG_USB_CDC_VENDOR_ID);
-               device_desc.idProduct = cpu_to_le16(CONFIG_USB_CDC_PRODUCT_ID);
+#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)
+               device_desc.idVendor = cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);
+               device_desc.idProduct = cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);
 #else
                if (!cdc) {
                        device_desc.idVendor =
@@ -2119,7 +2121,7 @@ static int eth_bind(struct usb_gadget *gadget)
        in_ep = usb_ep_autoconfig(gadget, &fs_source_desc);
        if (!in_ep) {
 autoconf_fail:
-               error("can't autoconfigure on %s\n",
+               pr_err("can't autoconfigure on %s\n",
                        gadget->name);
                return -ENODEV;
        }
@@ -2140,7 +2142,7 @@ autoconf_fail:
                if (status_ep) {
                        status_ep->driver_data = status_ep;     /* claim */
                } else if (rndis) {
-                       error("can't run RNDIS on %s", gadget->name);
+                       pr_err("can't run RNDIS on %s", gadget->name);
                        return -ENODEV;
 #ifdef CONFIG_USB_ETH_CDC
                } else if (cdc) {
@@ -2242,7 +2244,7 @@ autoconf_fail:
        if (rndis) {
                status = rndis_init();
                if (status < 0) {
-                       error("can't init RNDIS, %d", status);
+                       pr_err("can't init RNDIS, %d", status);
                        goto fail;
                }
        }
@@ -2333,7 +2335,7 @@ fail0:
        return 0;
 
 fail:
-       error("%s failed, status = %d", __func__, status);
+       pr_err("%s failed, status = %d", __func__, status);
        eth_unbind(gadget);
        return status;
 }
@@ -2348,7 +2350,7 @@ int dm_usb_init(struct eth_dev *e_dev)
 
        ret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &dev);
        if (!dev || ret) {
-               error("No USB device found\n");
+               pr_err("No USB device found\n");
                return -ENODEV;
        }
 
@@ -2367,7 +2369,7 @@ static int _usb_eth_init(struct ether_priv *priv)
 
 #ifdef CONFIG_DM_USB
        if (dm_usb_init(dev)) {
-               error("USB ether not found\n");
+               pr_err("USB ether not found\n");
                return -ENODEV;
        }
 #else
@@ -2382,20 +2384,20 @@ static int _usb_eth_init(struct ether_priv *priv)
        strlcpy(host_addr, CONFIG_USBNET_HOST_ADDR, sizeof(host_addr));
 #endif
        /* Check if the user overruled the MAC addresses */
-       if (getenv("usbnet_devaddr"))
-               strlcpy(dev_addr, getenv("usbnet_devaddr"),
+       if (env_get("usbnet_devaddr"))
+               strlcpy(dev_addr, env_get("usbnet_devaddr"),
                        sizeof(dev_addr));
 
-       if (getenv("usbnet_hostaddr"))
-               strlcpy(host_addr, getenv("usbnet_hostaddr"),
+       if (env_get("usbnet_hostaddr"))
+               strlcpy(host_addr, env_get("usbnet_hostaddr"),
                        sizeof(host_addr));
 
        if (!is_eth_addr_valid(dev_addr)) {
-               error("Need valid 'usbnet_devaddr' to be set");
+               pr_err("Need valid 'usbnet_devaddr' to be set");
                goto fail;
        }
        if (!is_eth_addr_valid(host_addr)) {
-               error("Need valid 'usbnet_hostaddr' to be set");
+               pr_err("Need valid 'usbnet_hostaddr' to be set");
                goto fail;
        }
 
@@ -2418,14 +2420,14 @@ static int _usb_eth_init(struct ether_priv *priv)
        gadget = dev->gadget;
        usb_gadget_connect(gadget);
 
-       if (getenv("cdc_connect_timeout"))
-               timeout = simple_strtoul(getenv("cdc_connect_timeout"),
+       if (env_get("cdc_connect_timeout"))
+               timeout = simple_strtoul(env_get("cdc_connect_timeout"),
                                                NULL, 10) * CONFIG_SYS_HZ;
        ts = get_timer(0);
        while (!dev->network_started) {
                /* Handle control-c and timeouts */
                if (ctrlc() || (get_timer(ts) > timeout)) {
-                       error("The remote end did not respond in time.");
+                       pr_err("The remote end did not respond in time.");
                        goto fail;
                }
                usb_gadget_handle_interrupts(0);
@@ -2454,7 +2456,7 @@ static int _usb_eth_send(struct ether_priv *priv, void *packet, int length)
                rndis_pkt = malloc(length +
                                        sizeof(struct rndis_packet_msg_type));
                if (!rndis_pkt) {
-                       error("No memory to alloc RNDIS packet");
+                       pr_err("No memory to alloc RNDIS packet");
                        goto drop;
                }
                rndis_add_hdr(rndis_pkt, length);
@@ -2572,7 +2574,7 @@ static int usb_eth_recv(struct eth_device *netdev)
 
        ret = _usb_eth_recv(priv);
        if (ret) {
-               error("error packet receive\n");
+               pr_err("error packet receive\n");
                return ret;
        }
 
@@ -2583,7 +2585,7 @@ static int usb_eth_recv(struct eth_device *netdev)
                net_process_received_packet(net_rx_packets[0],
                                            dev->rx_req->length);
        } else {
-               error("dev->rx_req invalid");
+               pr_err("dev->rx_req invalid");
        }
        packet_received = 0;
        rx_submit(dev, dev->rx_req, 0);
@@ -2639,7 +2641,7 @@ static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 
        ret = _usb_eth_recv(priv);
        if (ret) {
-               error("error packet receive\n");
+               pr_err("error packet receive\n");
                return ret;
        }
 
@@ -2648,7 +2650,7 @@ static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
                        *packetp = (uchar *)net_rx_packets[0];
                        return ethdev->rx_req->length;
                } else {
-                       error("dev->rx_req invalid");
+                       pr_err("dev->rx_req invalid");
                        return -EFAULT;
                }
        }
@@ -2683,7 +2685,7 @@ static int usb_eth_probe(struct udevice *dev)
        l_priv = priv;
 
        get_ether_addr(CONFIG_USBNET_DEVADDR, pdata->enetaddr);
-       eth_setenv_enetaddr("usbnet_devaddr", pdata->enetaddr);
+       eth_env_set_enetaddr("usbnet_devaddr", pdata->enetaddr);
 
        return 0;
 }
@@ -2704,13 +2706,13 @@ int usb_ether_init(void)
 
        ret = uclass_first_device(UCLASS_USB_DEV_GENERIC, &usb_dev);
        if (!usb_dev || ret) {
-               error("No USB device found\n");
+               pr_err("No USB device found\n");
                return ret;
        }
 
        ret = device_bind_driver(usb_dev, "usb_ether", "usb_ether", &dev);
        if (!dev || ret) {
-               error("usb - not able to bind usb_ether device\n");
+               pr_err("usb - not able to bind usb_ether device\n");
                return ret;
        }
 
Unnamed repository; edit this file 'description' to name the repository.