Hi Heiko, > add the possibility to set the iSerialNumber board specific. > Default value for iSerialNumber is 0x0. This value can > changed board specific through the new function > g_dnl_set_serialnumber() which must be called from the > board specific function g_dnl_bind_fixup(). > > Signed-off-by: Heiko Schocher <h...@denx.de> > Cc: Marek Vasut <marek.va...@gmail.com> > Cc: Lukasz Majewski <l.majew...@samsung.com> > Cc: Kyungmin Park <kyungmin.p...@samsung.com> >
I tried to apply the patch to the newest origin/master (SHA1: 509dca7a11aad394d781a9d31a7bfa6692562741). Unfortunately it failed due to some previous patches applied to g_dnl.c file. Please rebase on top of origin/master > --- > changes for v2: > - as Lukasz Majewski suggested, remove CONFIG_G_DNL_SERIAL_STRING > define > --- > drivers/usb/gadget/g_dnl.c | 20 ++++++++++++++++++++ > include/g_dnl.h | 1 + > 2 files changed, 21 insertions(+) > > diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c > index 40868c0..7a3d507 100644 > --- a/drivers/usb/gadget/g_dnl.c > +++ b/drivers/usb/gadget/g_dnl.c > @@ -32,6 +32,9 @@ > #define STRING_PRODUCT 2 > /* Index of String Descriptor describing this configuration */ > #define STRING_USBDOWN 2 > +/* Index of String serial */ > +#define STRING_SERIAL 3 > +#define MAX_STRING_SERIAL 32 > /* Number of supported configurations */ > #define CONFIGURATION_NUMBER 1 > > @@ -39,8 +42,16 @@ > > static const char shortname[] = "usb_dnl_"; > static const char product[] = "USB download gadget"; > +static char g_dnl_serial[MAX_STRING_SERIAL]; > static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; > > +void g_dnl_set_serialnumber(char *s) > +{ > + memset(g_dnl_serial, 0, MAX_STRING_SERIAL); > + if (strlen(s) < MAX_STRING_SERIAL) > + strncpy(g_dnl_serial, s, strlen(s)); > +} > + > static struct usb_device_descriptor device_desc = { > .bLength = sizeof device_desc, > .bDescriptorType = USB_DT_DEVICE, > @@ -52,6 +63,7 @@ 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, > + .iSerialNumber = STRING_SERIAL, > .bNumConfigurations = 1, > }; > > @@ -62,6 +74,7 @@ static struct usb_device_descriptor device_desc = { > static struct usb_string g_dnl_string_defs[] = { > {.s = manufacturer}, > {.s = product}, > + {.s = g_dnl_serial}, > { } /* end of list */ > }; > > @@ -145,6 +158,13 @@ static int g_dnl_bind(struct usb_composite_dev > *cdev) g_dnl_string_defs[1].id = id; > device_desc.iProduct = id; > > + id = usb_string_id(cdev); > + if (id < 0) > + return id; > + > + g_dnl_string_defs[2].id = id; > + device_desc.iSerialNumber = id; > + > 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..be3114f 100644 > --- a/include/g_dnl.h > +++ b/include/g_dnl.h > @@ -13,6 +13,7 @@ > int g_dnl_bind_fixup(struct usb_device_descriptor *); > int g_dnl_register(const char *s); > void g_dnl_unregister(void); > +void g_dnl_set_serialnumber(char *); > > /* USB initialization declaration - board specific */ > void board_usb_init(void); -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot