dfu:usb: Support for g_dnl composite download gadget.

Composite USB download gadget support (g_dnl) for download functions.
This code works on top of composite gadget.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 87d1918cb9add9ac7e4811ed4b2a383821d5bad6..2c067c8b6276d183b90da0181a9d5c468d395071 100644 (file)
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -29,6 +29,7 @@ LIB   := $(obj)libusb_gadget.o
 ifdef CONFIG_USB_GADGET
 COBJS-y += epautoconf.o config.o usbstring.o
 COBJS-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
+COBJS-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o
 endif
 ifdef CONFIG_USB_ETHER
 COBJS-y += ether.o epautoconf.o config.o usbstring.o

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
new file mode 100644 (file)
index 0000000..7d87050
--- /dev/null
+++ b/drivers/usb/gadget/g_dnl.c
@@ -0,0 +1,202 @@
+/*
+ * g_dnl.c -- USB Downloader Gadget
+ *
+ * Copyright (C) 2012 Samsung Electronics
+ * Lukasz Majewski  <l.majewski@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <errno.h>
+#include <common.h>
+#include <malloc.h>
+
+#include <mmc.h>
+#include <part.h>
+
+#include <g_dnl.h>
+#include "f_dfu.h"
+
+#include "gadget_chips.h"
+#include "composite.c"
+
+/*
+ * One needs to define the following:
+ * CONFIG_G_DNL_VENDOR_NUM
+ * CONFIG_G_DNL_PRODUCT_NUM
+ * CONFIG_G_DNL_MANUFACTURER
+ * at e.g. ./include/configs/<board>.h
+ */
+
+#define STRING_MANUFACTURER 25
+#define STRING_PRODUCT 2
+#define STRING_USBDOWN 2
+#define CONFIG_USBDOWNLOADER 2
+
+#define DRIVER_VERSION         "usb_dnl 2.0"
+
+static const char shortname[] = "usb_dnl_";
+static const char product[] = "USB download gadget";
+static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER;
+
+static struct usb_device_descriptor device_desc = {
+       .bLength = sizeof device_desc,
+       .bDescriptorType = USB_DT_DEVICE,
+
+       .bcdUSB = __constant_cpu_to_le16(0x0200),
+       .bDeviceClass = USB_CLASS_COMM,
+       .bDeviceSubClass = 0x02, /*0x02:CDC-modem , 0x00:CDC-serial*/
+
+       .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM),
+       .idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM),
+       .iProduct = STRING_PRODUCT,
+       .bNumConfigurations = 1,
+};
+
+/* static strings, in UTF-8 */
+static struct usb_string g_dnl_string_defs[] = {
+       { 0, manufacturer, },
+       { 1, product, },
+};
+
+static struct usb_gadget_strings g_dnl_string_tab = {
+       .language = 0x0409, /* en-us */
+       .strings = g_dnl_string_defs,
+};
+
+static struct usb_gadget_strings *g_dnl_composite_strings[] = {
+       &g_dnl_string_tab,
+       NULL,
+};
+
+static int g_dnl_unbind(struct usb_composite_dev *cdev)
+{
+       debug("%s\n", __func__);
+       return 0;
+}
+
+static int g_dnl_do_config(struct usb_configuration *c)
+{
+       const char *s = c->cdev->driver->name;
+       int ret = -1;
+
+       debug("%s: configuration: 0x%p composite dev: 0x%p\n",
+             __func__, c, c->cdev);
+
+       printf("GADGET DRIVER: %s\n", s);
+       if (!strcmp(s, "usb_dnl_dfu"))
+               ret = dfu_add(c);
+
+       return ret;
+}
+
+static int g_dnl_config_register(struct usb_composite_dev *cdev)
+{
+       static struct usb_configuration config = {
+               .label = "usb_dnload",
+               .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
+               .bConfigurationValue =  CONFIG_USBDOWNLOADER,
+               .iConfiguration =       STRING_USBDOWN,
+
+               .bind = g_dnl_do_config,
+       };
+
+       return usb_add_config(cdev, &config);
+}
+
+static int g_dnl_bind(struct usb_composite_dev *cdev)
+{
+       struct usb_gadget *gadget = cdev->gadget;
+       int id, ret;
+       int gcnum;
+
+       debug("%s: gadget: 0x%p cdev: 0x%p\n", __func__, gadget, cdev);
+
+       id = usb_string_id(cdev);
+
+       if (id < 0)
+               return id;
+       g_dnl_string_defs[0].id = id;
+       device_desc.iManufacturer = id;
+
+       id = usb_string_id(cdev);
+       if (id < 0)
+               return id;
+
+       g_dnl_string_defs[1].id = id;
+       device_desc.iProduct = id;
+
+       ret = g_dnl_config_register(cdev);
+       if (ret)
+               goto error;
+
+       gcnum = usb_gadget_controller_number(gadget);
+
+       debug("gcnum: %d\n", gcnum);
+       if (gcnum >= 0)
+               device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);
+       else {
+               debug("%s: controller '%s' not recognized\n",
+                       shortname, gadget->name);
+               device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
+       }
+
+       return 0;
+
+ error:
+       g_dnl_unbind(cdev);
+       return -ENOMEM;
+}
+
+static struct usb_composite_driver g_dnl_driver = {
+       .name = NULL,
+       .dev = &device_desc,
+       .strings = g_dnl_composite_strings,
+
+       .bind = g_dnl_bind,
+       .unbind = g_dnl_unbind,
+};
+
+int g_dnl_register(const char *type)
+{
+       /* We only allow "dfu" atm, so 3 should be enough */
+       static char name[sizeof(shortname) + 3];
+       int ret;
+
+       if (!strcmp(type, "dfu")) {
+               strcpy(name, shortname);
+               strcat(name, type);
+       } else {
+               printf("%s: unknown command: %s\n", __func__, type);
+               return -EINVAL;
+       }
+
+       g_dnl_driver.name = name;
+
+       debug("%s: g_dnl_driver.name: %s\n", __func__, g_dnl_driver.name);
+       ret = usb_composite_register(&g_dnl_driver);
+
+       if (ret) {
+               printf("%s: failed!, error: %d\n", __func__, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+void g_dnl_unregister(void)
+{
+       usb_composite_unregister(&g_dnl_driver);
+}

diff --git a/include/g_dnl.h b/include/g_dnl.h
new file mode 100644 (file)
index 0000000..0ec7440
--- /dev/null
+++ b/include/g_dnl.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (C) 2012 Samsung Electronics
+ *  Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __G_DOWNLOAD_H_
+#define __G_DOWNLOAD_H_
+
+#include <linux/usb/ch9.h>
+#include <usbdescriptors.h>
+#include <linux/usb/gadget.h>
+
+int g_dnl_register(const char *s);
+void g_dnl_unregister(void);
+
+/* USB initialization declaration - board specific */
+void board_usb_init(void);
+#endif /* __G_DOWNLOAD_H_ */