All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 3/5] usb, g_dnl: make iSerialNumber board configurable
Date: Tue, 22 Oct 2013 12:25:43 +0200	[thread overview]
Message-ID: <1382437545-23720-4-git-send-email-hs@denx.de> (raw)
In-Reply-To: <1382437545-23720-1-git-send-email-hs@denx.de>

add the possibility to set the iSerialNumber board specific.
Therefore the CONFIG_G_DNL_SERIAL_STRING is introduced, which
defines the maximum length of the iSerialNumber string.
The new function g_dnl_set_serialnumber() must called from
g_dnl_bind_fixup(), to setup the iSerialNumber string.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/usb/gadget/g_dnl.c | 28 ++++++++++++++++++++++++++++
 include/g_dnl.h            |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 40868c0..5f09d66 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -39,8 +39,21 @@
 
 static const char shortname[] = "usb_dnl_";
 static const char product[] = "USB download gadget";
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+#define STRING_SERIAL  3
+static char g_dnl_serial[CONFIG_G_DNL_SERIAL_STRING + 1];
+#endif
 static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER;
 
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+void g_dnl_set_serialnumber(char *s)
+{
+	memset(g_dnl_serial, 0, CONFIG_G_DNL_SERIAL_STRING + 1);
+	if (strlen(s) <= CONFIG_G_DNL_SERIAL_STRING)
+		strncpy(g_dnl_serial, s, strlen(s));
+}
+#endif
+
 static struct usb_device_descriptor device_desc = {
 	.bLength = sizeof device_desc,
 	.bDescriptorType = USB_DT_DEVICE,
@@ -52,6 +65,9 @@ static struct usb_device_descriptor device_desc = {
 	.idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM),
 	.idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM),
 	.iProduct = STRING_PRODUCT,
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+	.iSerialNumber = STRING_SERIAL,
+#endif
 	.bNumConfigurations = 1,
 };
 
@@ -62,6 +78,9 @@ static struct usb_device_descriptor device_desc = {
 static struct usb_string g_dnl_string_defs[] = {
 	{.s = manufacturer},
 	{.s = product},
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+	{.s = g_dnl_serial},
+#endif
 	{ }		/* end of list */
 };
 
@@ -145,6 +164,15 @@ static int g_dnl_bind(struct usb_composite_dev *cdev)
 	g_dnl_string_defs[1].id = id;
 	device_desc.iProduct = id;
 
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+	id = usb_string_id(cdev);
+	if (id < 0)
+		return id;
+
+	g_dnl_string_defs[2].id = id;
+	device_desc.iSerialNumber = id;
+#endif
+
 	g_dnl_bind_fixup(&device_desc);
 	ret = g_dnl_config_register(cdev);
 	if (ret)
diff --git a/include/g_dnl.h b/include/g_dnl.h
index 2b2f11a..a539a34 100644
--- a/include/g_dnl.h
+++ b/include/g_dnl.h
@@ -13,6 +13,9 @@
 int g_dnl_bind_fixup(struct usb_device_descriptor *);
 int g_dnl_register(const char *s);
 void g_dnl_unregister(void);
+#if defined(CONFIG_G_DNL_SERIAL_STRING)
+void g_dnl_set_serialnumber(char *);
+#endif
 
 /* USB initialization declaration - board specific */
 void board_usb_init(void);
-- 
1.8.3.1

  parent reply	other threads:[~2013-10-22 10:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-22 10:25 [U-Boot] [PATCH v1 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher
2013-10-22 10:25 ` [U-Boot] [PATCH v1 1/5] bootcount: store bootcount var in environment Heiko Schocher
2013-10-24 11:31   ` Vaibhav Bedia
2013-10-22 10:25 ` [U-Boot] [PATCH v1 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher
2013-10-22 10:25 ` Heiko Schocher [this message]
2013-10-22 12:37   ` [U-Boot] [PATCH v1 3/5] usb, g_dnl: make iSerialNumber board configurable Lukasz Majewski
2013-10-22 12:52     ` Heiko Schocher
2013-10-22 13:34       ` Lukasz Majewski
2013-10-22 10:25 ` [U-Boot] [PATCH v1 4/5] usb, g_dnl: make bcdDevice value configurable Heiko Schocher
2013-10-22 12:20   ` Lukasz Majewski
2013-10-22 10:25 ` [U-Boot] [PATCH v1 5/5] arm, am335x: update for the siemens boards Heiko Schocher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382437545-23720-4-git-send-email-hs@denx.de \
    --to=hs@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.