USB improvements and cleanpus, g_multi install mode
Subsystems (2)
v4 cover USB improvements and cleanpus, g_multi install mode
Hello again,
After comments from Xiaofan Chen I updated the INF files used in provious patchset. As a matter of fact I've replaced the linux.inf file used so far for RNDIS and comments in gadget_serial.txt.
Other then that, there are only a few changes to the gadget_multi.txt file suggested by Xiaofan.
The other patches are the same as with previous version of the patchset:
The first 6 patches are what I've posted way back (the original and v2 patchset) previously. I'm resending it again since those are required for later patches plus there were some minor fixes. The patches are:
USB: gadget: g_mass_storage: static data instead of dynamic
allocation
A micro optimisation preventing a kmalloc call() which would otherwise be always called at the very beginning for the same area size.
This was submitted previously but Greg did not included it in his quilt tree (unless I overlooked something) so I'll posting it again for completeness. Sorry if that creates confusion.
In my opinion this is worth including as it simplifies the code a bit and removes the call to kmalloc/kfree (hidden in fsg_common_init) which in my opinion is a good thing as well.
USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
USB: gadget: f_fs: functionfs_add() renamed to
functionfs_bind_config()
All other USB composite functions use foo_bind_config() to add function to USB configuration so changed the names for mass storage and FunctionFS as well.
The inconstancy apparent in multifunction gadgets stroke me for quite some time now. I was always reluctant to submit patch thinking that it would be just stupid name change but finally couldn't stand it. ;)
In case of mass storage the old (fsg_add()) function is still available but marked deprecated. In case of FFS the old (functionfs_add()) function has been removed.
USB: gadget: composite: usb_string_ids_*() functions added
USB: gadget: f_fs: use usb_string_ids_n()
usb_string_ids_n() and usb_string_ids_tab() functions added for batch sting IDs requests.
This simplifies the code where one would call usb_string_id() several times and each time has to check for error codes. With usb_string_ids_n() one can get a whole bunch of IDs with one call and with usb_string_ids_tab() fill an array full of usb_string structures.
USB: gadget: g_multi: code clean up and refactoring
g_multi clean up, fixes, etc.
Then there are two new patches:
USB: gadget: g_ether: updated INF file
USB: gadget: g_serial: INF file updated
This replaces the outdated INF files for Ethernet and serial gadgets with ones that work under recent Windows. They were tested on Win XP SP3, Vista and 7.
And an updated version of a patch that was present since the beginning:
USB: gadget: g_multi: added documentation and INF files
Also a bit of documentation for g_multi and an INF file tested with Windows XP SP3.
Then, there is this patch David didn't seem impressed with:
USB: gadget: g_multi: more configurable
Adds a Kconfig option for each function provided by the g_multi. This may look like making g_multi complex but I see it more as creating an gadget that can be used to test various functionality as well as show that adding new functions is not so hard even in a complex gadget since the code adds a clear separation of each function so that one may easily see which parts are for each function.
And, finally 3 patches added with v3 patchset with install mode functionality:
USB: gadget: composite: addad disconnect callback
Adds an disconnect callback to the composite framework which is called whenever composite receives disconnect from the hardware driver.
USB: gadget: f_mass_storage: added eject callback
Adds a pre- and post-eject callbacks. The first may prevent eject from really happen even though no error is reported to the host so host things it succeeded. The second is called after the file is closed so one may use it for some funky stuff which is otherwise impossible while mass storage function holds the file or mounting another file.
USB: gadget: g_multi: Install Mode added
This adds the install mode to the g_multi. Not to repeat myself, quote from documentation:
* Install mode
The install mode makes the gadget appear as a plain mass storage device the first time it is connected (and after each disconnect). This lets one develop an "autorun" CD-ROM image with drivers and put it as the first logical unit.
** Workings of the install mode
As you may know, mass storage gadget may provide several logical units and its easier to think of them as separate drives. When install mode is enabled, g_multi forces the first logical unit to be a read-only CD-ROM. When install mode is enabled but mass storage itself is not then exactly one logical unit is set.
When an eject request is made on that logical unit, the file is not really closed but the gadget switches it's mode to the full flagged gadget with all the other functions. If mass storage is among them, the firs logical unit will be the CD-ROM image with drivers (which may be seen as a bad thing).
When gadget is disconnected and connected afterwards it will work again in install mode. Some heuristics are used here -- if disconnection (or suspend) happens no longer then 10 seconds after last eject on the first logical unit then on next enumeration gadget will claim to be full flagged otherwise it'll stick to install mode.
** Interoperability with host
As said, the idea behind install mode is that hosts that require drivers will be able to get them without the need for additional CD-ROM or another medium provided with the device.
CD-ROM image should provide an "autorun" functionality witch will install drivers and eject the emulated CD-ROM to switch gadget into the other mode which will be handled by newly installed drivers. If drivers are installed already, they should "catch" the install mode device by product and vendor IDs and issue an eject.
This mode is not very Linux-friendly though since Linux and Linux based systems have no notion of autorun (which from security point of view is a good thing) and there's no way of adding some file on the image which will make gadget eject the device.
Fortunately, there's USB_ModeSwitch and/or udev which should handle it just fine. A single rule need to be added and everything should work fine.
Documentation/usb/gadget_multi.txt | 211 ++++++++++ Documentation/usb/gadget_serial.txt | 87 +---- Documentation/usb/linux-cdc-acm.inf | 106 +++++ Documentation/usb/linux-rndis.inf | 79 ++++ Documentation/usb/linux.inf | 200 ---------- drivers/usb/gadget/Kconfig | 88 +++-- drivers/usb/gadget/composite.c | 73 ++++- drivers/usb/gadget/f_fs.c | 36 +- drivers/usb/gadget/f_mass_storage.c | 122 ++++-- drivers/usb/gadget/g_ffs.c | 2 +- drivers/usb/gadget/mass_storage.c | 17 +- drivers/usb/gadget/multi.c | 745 ++++++++++++++++++++++++++--------- include/linux/usb/composite.h | 6 + include/linux/usb/functionfs.h | 6 +- 14 files changed, 1220 insertions(+), 558 deletions(-) create mode 100644 Documentation/usb/gadget_multi.txt create mode 100644 Documentation/usb/linux-cdc-acm.inf create mode 100644 Documentation/usb/linux-rndis.inf delete mode 100644 Documentation/usb/linux.inf
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Micha흢 "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
PATCH v4 1/13 USB: gadget: g_mass_storage: static data instead of dynamic allocation
This patch changes msg_do_config() function so that it uses a static object for a fsg_common structure instead of dynamically allocated. This is a micro-optimisation.
--- drivers/usb/gadget/mass_storage.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
drivers/usb/gadget/mass_storage.c +7 -6
@@ -143,7 +143,7 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { -struct fsg_common *common; +static struct fsg_common common, *retp;struct fsg_config config;int ret;
@@ -154,12 +154,13 @@ static int __init msg_do_config(struct usb_configuration *c)fsg_config_from_params (&config, &mod_data); config.thread_exits = msg_thread_exits; - common =fsg_common_init (0 , c->cdev, &config); -if (IS_ERR (common)) -return PTR_ERR (common); - ret =fsg_add (c->cdev, c, common); -fsg_common_put (common); + retp =fsg_common_init (&common, c->cdev, &config); +if (IS_ERR (retp)) +return PTR_ERR (retp); + + ret =fsg_add (c->cdev, c, &common); +fsg_common_put (&common);return ret; }
Signature · 1 line
1.7.1
PATCH v4 1/13 USB: gadget: g_mass_storage: static data instead of dynamic allocation
This patch changes msg_do_config() function so that it uses a static object for a fsg_common structure instead of dynamically allocated. This is a micro-optimisation.
---
Compared to previous patch fixed retp needlessly having static instead of automatic storage.
drivers/usb/gadget/mass_storage.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/usb/gadget/mass_storage.c +9 -6
@@ -143,7 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { -struct fsg_common *common; +static struct fsg_common common; + +struct fsg_common *retp;struct fsg_config config;int ret;
@@ -154,12 +156,13 @@ static int __init msg_do_config(struct usb_configuration *c)fsg_config_from_params (&config, &mod_data); config.thread_exits = msg_thread_exits; - common =fsg_common_init (0 , c->cdev, &config); -if (IS_ERR (common)) -return PTR_ERR (common); - ret =fsg_add (c->cdev, c, common); -fsg_common_put (common); + retp =fsg_common_init (&common, c->cdev, &config); +if (IS_ERR (retp)) +return PTR_ERR (retp); + + ret =fsg_add (c->cdev, c, &common); +fsg_common_put (&common);return ret; }
Signature · 1 line
1.7.1
PATCH v4 2/13 USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
In reply to Michal NazarewiczMass Storage Function had a bit unique name for function used to add it to USB configuration. Renamed as to match naming convention of other functions.
--- drivers/usb/gadget/f_mass_storage.c | 13 ++++++++++--- drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/multi.c | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-)
drivers/usb/gadget/f_mass_storage.c +10 -3
@@ -3023,9 +3023,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = { NULL, }; -static int fsg_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct fsg_common *common) +static int fsg_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct fsg_common *common) {struct fsg_dev *fsg;int rc;
@@ -3072,6 +3072,13 @@ error_free_fsg:return rc; } +static inline int __deprecated __maybe_unused +fsg_add (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct fsg_common *common) +{ +return fsg_bind_config (cdev, c, common); +}/************************* Module parameters *************************/
drivers/usb/gadget/mass_storage.c +1 -1
@@ -159,7 +159,7 @@ static int __init msg_do_config(struct usb_configuration *c)if (IS_ERR (retp))return PTR_ERR (retp); - ret =fsg_add (c->cdev, c, &common); + ret =fsg_bind_config (c->cdev, c, &common);fsg_common_put (&common);return ret; }
drivers/usb/gadget/multi.c +2 -2
@@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)if (ret <0 )return ret; - ret =fsg_add (c->cdev, c, fsg_common); + ret =fsg_bind_config (c->cdev, c, fsg_common);if (ret <0 )return ret;
@@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)if (ret <0 )return ret; - ret =fsg_add (c->cdev, c, fsg_common); + ret =fsg_bind_config (c->cdev, c, fsg_common);if (ret <0 )return ret;
Signature · 1 line
1.7.1
PATCH v4 3/13 USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
FunctionFS had a bit unique name for function used to add it to USB configuration. Renamed as to match naming convention of other functions.
--- drivers/usb/gadget/f_fs.c | 6 +++--- drivers/usb/gadget/g_ffs.c | 2 +- include/linux/usb/functionfs.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/gadget/f_fs.c +3 -3
@@ -1480,9 +1480,9 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count) } -static int functionfs_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct ffs_data *ffs) +static int functionfs_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct ffs_data *ffs) {struct ffs_function *func;int ret;
drivers/usb/gadget/g_ffs.c +1 -1
@@ -388,7 +388,7 @@ static int __gfs_do_config(struct usb_configuration *c,return ret; } - ret =functionfs_add (c->cdev, c, gfs_ffs_data); + ret =functionfs_bind_config (c->cdev, c, gfs_ffs_data);if (unlikely (ret <0 ))return ret;
include/linux/usb/functionfs.h +3 -3
@@ -180,9 +180,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)static void functionfs_unbind (struct ffs_data *ffs) __attribute__((nonnull)); -static int functionfs_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct ffs_data *ffs) +static int functionfs_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct ffs_data *ffs) __attribute__((warn_unused_result, nonnull));
Signature · 1 line
1.7.1
PATCH v4 4/13 USB: gadget: composite: usb_string_ids_*() functions added
usb_string_ids_tab() and usb_string_ids_n() functions added to the composite framework. The first accepts an array of usb_string object and for each registeres a string id and the second registeres a given number of ids and returns the first.
This may simplify string ids registration since gadgets and composite functions won't have to call usb_string_id() several times and each time check for errer status -- all this will be done with a single call.
--- drivers/usb/gadget/composite.c | 71 +++++++++++++++++++++++++++++++++++++-- include/linux/usb/composite.h | 4 ++ 2 files changed, 71 insertions(+), 4 deletions(-)
drivers/usb/gadget/composite.c +67 -4
@@ -673,20 +673,83 @@ static int get_string(struct usb_composite_dev *cdev,* string IDs. Drivers for functions, configurations, or gadgets will * then store that ID in the appropriate descriptors and string table. * -* All string identifier should be allocated using this routine, to -* ensure that for example different functions don't wrongly assign -* different meanings to the same identifier. +* All string identifier should be allocated using this, +* @usb_string_ids_tab() or @usb_string_ids_n() routine, to ensure +* that for example different functions don't wrongly assign different +* meanings to the same identifier. */ int usb_string_id (struct usb_composite_dev *cdev) {if (cdev->next_string_id <254 ) { -/* string id 0 is reserved */ +/* string id 0 is reserved by USB spec for list of +* supported languages */ +/* 255 reserved as well? -- mina86 */ cdev->next_string_id++;return cdev->next_string_id; }return -ENODEV ; } +/** +* usb_string_ids() - allocate unused string IDs in batch +* @cdev: the device whose string descriptor IDs are being allocated +* @str: an array of usb_string objects to assign numbers to +* Context: single threaded during gadget setup +* +* @usb_string_ids() is called from bind() callbacks to allocate +* string IDs. Drivers for functions, configurations, or gadgets will +* then copy IDs from the string table to the appropriate descriptors +* and string table for other languages. +* +* All string identifier should be allocated using this, +* @usb_string_id() or @usb_string_ids_n() routine, to ensure that for +* example different functions don't wrongly assign different meanings +* to the same identifier. +*/ +int usb_string_ids_tab (struct usb_composite_dev *cdev,struct usb_string *str) +{ +int next = cdev->next_string_id; + +for (; str->s; ++str) { +if (unlikely (next >=254 )) +return -ENODEV ; + str->id = ++next; + } + + cdev->next_string_id = next; + +return 0 ; +} + +/** +* usb_string_ids_n() - allocate unused string IDs in batch +* @cdev: the device whose string descriptor IDs are being allocated +* @n: number of string IDs to allocate +* Context: single threaded during gadget setup +* +* Returns the first requested ID. This ID and next @n-1 IDs are now +* valid IDs. At least providind that @n is non zore because if it +* is, returns last requested ID which is now very useful information. +* +* @usb_string_ids_n() is called from bind() callbacks to allocate +* string IDs. Drivers for functions, configurations, or gadgets will +* then store that ID in the appropriate descriptors and string table. +* +* All string identifier should be allocated using this, +* @usb_string_id() or @usb_string_ids_n() routine, to ensure that for +* example different functions don't wrongly assign different meanings +* to the same identifier. +*/ +int usb_string_ids_n (struct usb_composite_dev *c,unsigned n) +{ +unsigned next = c->next_string_id; +if (unlikely (n >254 || (unsigned )next + n >254 )) +return -ENODEV ; + c->next_string_id += n; +return next +1 ; +} + +/*-------------------------------------------------------------------------*/ static void composite_setup_complete (struct usb_ep *ep,struct usb_request *req)
include/linux/usb/composite.h +4 -0
@@ -342,6 +342,10 @@ struct usb_composite_dev { };extern int usb_string_id (struct usb_composite_dev *c); +extern int usb_string_ids_tab (struct usb_composite_dev *c, +struct usb_string *str); +extern int usb_string_ids_n (struct usb_composite_dev *c,unsigned n); +/* messaging utils */ #define DBG(d, fmt, args...) \
Signature · 1 line
1.7.1
PATCH v4 5/13 USB: gadget: f_fs: use usb_string_ids_n()
Use usb_string_ids_n() function to simplify string ids registeration.
--- drivers/usb/gadget/f_fs.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-)
drivers/usb/gadget/f_fs.c +12 -18
@@ -1377,7 +1377,8 @@ static void ffs_data_reset(struct ffs_data *ffs)static int functionfs_bind (struct ffs_data *ffs,struct usb_composite_dev *cdev) { -unsigned i, count; +struct usb_gadget_strings **lang; +int first_id;ENTER ();
@@ -1385,7 +1386,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) || test_and_set_bit(FFS_FL_BOUND, &ffs->flags)))return -EBADFD ; -ffs_data_get (ffs); + first_id =usb_string_ids_n (cdev, ffs->strings_count); +if (unlikely (first_id <0 )) +return first_id; ffs->ep0req =usb_ep_alloc_request (cdev->gadget->ep0,GFP_KERNEL );if (unlikely (!ffs->ep0req))
@@ -1393,25 +1396,16 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) ffs->ep0req->complete = ffs_ep0_complete; ffs->ep0req->context = ffs; -/* Get strings identifiers */ -for (count = ffs->strings_count, i =0 ; i < count; ++i) { -struct usb_gadget_strings **lang; - -int id =usb_string_id (cdev); -if (unlikely (id <0 )) { -usb_ep_free_request (cdev->gadget->ep0, ffs->ep0req); - ffs->ep0req =NULL ; -return id; - } - - lang = ffs->stringtabs; -do { - (*lang)->strings[i].id = id; - ++lang; - }while (*lang); + lang = ffs->stringtabs; +for (lang = ffs->stringtabs; *lang; ++lang) { +struct usb_string *str = (*lang)->strings; +int id = first_id; +for (; str->s; ++id, ++str) + str->id = id; } ffs->gadget = cdev->gadget; +ffs_data_get (ffs);return 0 ; }
Signature · 1 line
1.7.1
PATCH v4 6/13 USB: gadget: g_multi: code clean up and refactoring
The Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
--- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/multi.c | 262 +++++++++++++++++++++++++------------------- 2 files changed, 148 insertions(+), 115 deletions(-)
drivers/usb/gadget/Kconfig +1 -0
@@ -863,6 +863,7 @@ config USB_G_NOKIA config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NET + select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial link
drivers/usb/gadget/multi.c +147 -115
404 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 7/13 USB: gadget: g_ether: updated INF file
Updated the INF file for the g_ether gadegt. It should work with most recent Windows systems now. The file hase been also renamed to linux-rndis.inf rather then linux.inf.
--- Documentation/usb/linux-rndis.inf | 79 +++++++++++++++ Documentation/usb/linux.inf | 200 ------------------------------------- 2 files changed, 79 insertions(+), 200 deletions(-) create mode 100644 Documentation/usb/linux-rndis.inf delete mode 100644 Documentation/usb/linux.inf
Documentation/usb/linux-rndis.inf new file +79 -0
@@ -0,0 +1,79 @@ +; +; Remote NDIS template device setup file +; Copyright (c) Microsoft Corporation +; +; This is the template for the INF installation script +; for the RNDIS-over-USB host driver. +; This INF works for Windows XP SP2, Windows XP x64, +; Windows Server 2003 SP1 x86, x64, and ia64, and +; Windows Vista x86 and x64. +; This INF will work with Windows XP, Windows XP SP1, +; and Windows 2003 after applying specific hotfixes. +; +; Hacked for Linux by Michal Nazarewicz <[email protected]> +; No, I do not understand this file, don't blame me if it +; does not work... Original found at: +; <http://msdn.microsoft.com/en-us/library/ff570620.aspx>. +; Thanks to Xiaofan Chen for pointing to this template. +; + +[Version] +Signature = "$Windows NT$" +Class = Net +ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} +Provider = %Linux% +DriverVer = 06/21/2006,6.0.6000.16384 +;CatalogFile = device.cat + +[Manufacturer] +%Linux% = RndisDevices,NTx86,NTamd64,NTia64 + +; Decoration for x86 architecture +[RndisDevices.NTx86] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +; Decoration for x64 architecture +[RndisDevices.NTamd64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +; Decoration for ia64 architecture +[RndisDevices.NTia64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +;@@@ This is the common setting for setup +[ControlFlags] +ExcludeFromSelect=* + +; DDInstall section +; References the in-build Netrndis.inf +[RNDIS.NT.5.1] +Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType = 15 +; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF +include = netrndis.inf +needs = Usb_Rndis.ndi +AddReg = Rndis_AddReg_Vista + +; DDInstal.Services section +[RNDIS.NT.5.1.Services] +include = netrndis.inf +needs = Usb_Rndis.ndi.Services + +; Optional registry settings. You can modify as needed. +[RNDIS_AddReg_Vista] +HKR, NDI\params\VistaProperty, ParamDesc, 0, %Vista_Property% +HKR, NDI\params\VistaProperty, type, 0, "edit" +HKR, NDI\params\VistaProperty, LimitText, 0, "12" +HKR, NDI\params\VistaProperty, UpperCase, 0, "1" +HKR, NDI\params\VistaProperty, default, 0, " " +HKR, NDI\params\VistaProperty, optional, 0, "1" + +; No sys copyfiles - the sys files are already in-build +; (part of the operating system). +; We do not support XP SP1-, 2003 SP1-, ME, 9x. + +; Modify these strings for your device as needed. +[Strings] +Linux = "Linux Developer Community" +RndisDevice = "Ethernet/RNDIS Gadget" +Vista_Property = "Optional Vista Property"
Documentation/usb/linux.inf deleted +0 -200
200 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 7/13 USB: gadget: g_ether: updated INF file
Updated the INF file for the g_ether gadegt. It should work with most recent Windows systems now. The file hase been also renamed to linux-rndis.inf rather then linux.inf.
---
Quoted 7 lines · Greg KH
How about putting the following on the file:
; based on a example .inf file that was:
; Copyright (c) Microsoft Corporation
; and released under the MLPL as found at ; http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL
; For use only on Windows operating systems. ;
As requested only with a little bit different wording.
Still, I am not sure what to do with the serial INF. I cannot even find the original file Xiaofan posted not mentioning any associated license. I mean, I would leave it as is without changes but dunno...
Documentation/usb/linux-rndis.inf | 72 +++++++++++++ Documentation/usb/linux.inf | 200 ------------------------------------- 2 files changed, 72 insertions(+), 200 deletions(-) create mode 100644 Documentation/usb/linux-rndis.inf delete mode 100644 Documentation/usb/linux.inf
Documentation/usb/linux-rndis.inf new file +72 -0
@@ -0,0 +1,72 @@ + +; Hacked together by Michal Nazarewicz <[email protected]> +; with Xiaofan Chen's <[email protected]> help. + +; Based on template INF file found at +; <http://msdn.microsoft.com/en-us/library/ff570620.aspx> +; which was +; Copyright (c) Microsoft Corporation +; and released under the MLPL as found at: +; <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. +; For use only on Windows operating systems. + +[Version] +Signature = "$Windows NT$" +Class = Net +ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} +Provider = %Linux% +DriverVer = 06/21/2006,6.0.6000.16384 +;CatalogFile = device.cat + +[Manufacturer] +%Linux% = RndisDevices,NTx86,NTamd64,NTia64 + +; Decoration for x86 architecture +[RndisDevices.NTx86] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +; Decoration for x64 architecture +[RndisDevices.NTamd64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +; Decoration for ia64 architecture +[RndisDevices.NTia64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 + +;@@@ This is the common setting for setup +[ControlFlags] +ExcludeFromSelect=* + +; DDInstall section +; References the in-build Netrndis.inf +[RNDIS.NT.5.1] +Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType = 15 +; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF +include = netrndis.inf +needs = Usb_Rndis.ndi +AddReg = Rndis_AddReg_Vista + +; DDInstal.Services section +[RNDIS.NT.5.1.Services] +include = netrndis.inf +needs = Usb_Rndis.ndi.Services + +; Optional registry settings. You can modify as needed. +[RNDIS_AddReg_Vista] +HKR, NDI\params\VistaProperty, ParamDesc, 0, %Vista_Property% +HKR, NDI\params\VistaProperty, type, 0, "edit" +HKR, NDI\params\VistaProperty, LimitText, 0, "12" +HKR, NDI\params\VistaProperty, UpperCase, 0, "1" +HKR, NDI\params\VistaProperty, default, 0, " " +HKR, NDI\params\VistaProperty, optional, 0, "1" + +; No sys copyfiles - the sys files are already in-build +; (part of the operating system). +; We do not support XP SP1-, 2003 SP1-, ME, 9x. + +; Modify these strings for your device as needed. +[Strings] +Linux = "Linux Developer Community" +RndisDevice = "Ethernet/RNDIS Gadget" +Vista_Property = "Optional Vista Property"
Documentation/usb/linux.inf deleted +0 -200
200 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCHv4.1 07/13] USB: gadget: g_ether: updated INF file
Quoted 16 lines · Michal Nazarewicz
Updated the INF file for the
g_ethergadget. It should work with most recent Windows systems now. The file has been also renamed to linux-rndis.inf rather then linux.inf.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Quoted 7 lines · Greg KH
How about putting the following on the file:
; based on a example .inf file that was:
; Copyright (c) Microsoft Corporation ; and released under the MLPL as found at
; http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL
; For use only on Windows operating systems. ;
Quoted 6 lines
As requested only with a little bit different wording.
Still, I am not sure what to do with the serial INF. I cannot even find the original file Xiaofan posted not mentioning any associated license. I mean, I would leave it as is without changes but dunno...
I think all the INF file templates ultimately comes from DDK/WDK.
For example, the RNDIS template is from here. And the title says WDK.
http://msdn.microsoft.com/en-us/library/ff570620%28VS.85%29.aspx
For the CDC-ACM INF, the original template may well be from an ancient DDK. Anyway, here are some places to infer the CDC-ACM
INF file.
http://support.microsoft.com/kb/837637/en-us (important for Vista/Win7)
http://msdn.microsoft.com/en-us/library/ff542605%28VS.85%29.aspx
(same as above).
http://msdn.microsoft.com/en-us/library/ff543241.aspx (for 2000/XP)
http://msdn.microsoft.com/en-us/library/ff542491%28v=VS.85%29.aspx
http://msdn.microsoft.com/en-us/library/ff542559.aspx
Worse come worse, you might contact Microsoft about the license. The Microsoft Driver News group has a lot of experts including Microsoft employees who are very helpful. microsoft.public.development.device.drivers
Signature · 1 line
Xiaofan http://mcuee.blogspot.com
Re: [PATCHv4.1 07/13] USB: gadget: g_ether: updated INF file
The updated copyright note
Looks OK to me ... (Though it seems wrong to reference so many folk yet omit the original author (me)
However, I don't see a version
of the patch with the cleaner copyright notice.
Also, please don't rename the file without updating all the references to the original name. Since thoses refs are in docs all over the web ... I think it's best to just not rename it.
Re: [PATCHv4.1 07/13] USB: gadget: g_ether: updated INF file
Quoted 4 lines · David Brownell
The updated copyright note
Looks OK to me ... (Though it seems wrong to reference so many folk yet omit the original author (me)
Uh... I basically took what Xiaofan provided and changed IDs and that's why. But true enough, as I think about it now, I took some parts from the original linux.inf file so there's probably *at* *least* as much your work as mine in there.
I'll add you in the next version. Or should I remove the notices all together? Personally I feel they serve two purposes: give credit and let others know who might be a good person to ask question. I'm fine either way...
Quoted 8 lines
However, I don't see a version
of the patch with the cleaner copyright notice.Also, please don't rename the file without updating all the references to the original name. Since thoses refs are in docs all over the web ... I think it's best to just not rename it.
Ah, haven't thought about that. I grepped Documentation/ but forgot about grepping my personal copy of the Internet I keep in my basement. ;)
I intended a consistent naming and that's why the rename. In any way, I'll get the old name in the next version of the patch.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv4 07/13] USB: gadget: g_ether: updated INF file
In reply to Michal NazarewiczQuoted 1 line · Michal Nazarewicz
+; Copyright (c) Microsoft Corporation
Erm, do we have the right to redistribute these changes, then?
In principle, supporting more versions of MS-Windows is a good thing, but we need appropriate rights to do so, and it's not clear to me that we have those rights ..
Re: [PATCHv4 07/13] USB: gadget: g_ether: updated INF file
Quoted 11 lines · David Brownell
Quoted 1 line · Michal Nazarewicz
+; Copyright (c) Microsoft Corporation
Erm, do we have the right to redistribute these changes, then?
In principle, supporting more versions of MS-Windows is a good thing, but we need appropriate rights to do so, and it's not clear to me that we have those rights ..
http://msdn.microsoft.com/en-us/library/ff570620.aspx
I will think you can redistribute the file. After all, the template is provided by Microsoft to an IHV (independent hardware vendor) to use the Remote NDIS driver.
Signature · 1 line
Xiaofan http://mcuee.blogspot.com
PATCH v4 8/13 USB: gadget: g_serial: INF file updated
In reply to Michal NazarewiczUpdated the INF file for g_serial gadget. It should work with most recent Windows systems now.
--- Documentation/usb/gadget_serial.txt | 87 +++------------------------- Documentation/usb/linux-cdc-acm.inf | 106 +++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 77 deletions(-) create mode 100644 Documentation/usb/linux-cdc-acm.inf
Documentation/usb/gadget_serial.txt +10 -77
@@ -151,88 +151,23 @@ instructions below to install the host side driver. Installing the Windows Host ACM Driver -------------------------------------- -To use the Windows ACM driver you must have the files "gserial.inf" -and "usbser.sys" together in a folder on the Windows machine. - -The "gserial.inf" file is given here. - --------------------- CUT HERE -------------------- -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%LINUX% -DriverVer=08/17/2004,0.0.2.0 -; Copyright (C) 2004 Al Borchers ([email protected]) - -[Manufacturer] -%LINUX%=GSerialDeviceList - -[GSerialDeviceList] -%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7 - -[DestinationDirs] -DefaultDestDir=10,System32\Drivers - -[GSerialInstall] -CopyFiles=GSerialCopyFiles -AddReg=GSerialAddReg - -[GSerialCopyFiles] -usbser.sys - -[GSerialAddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[GSerialInstall.Services] -AddService = usbser,0x0002,GSerialService - -[GSerialService] -DisplayName = %GSERIAL_DISPLAY_NAME% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %10%\System32\Drivers\usbser.sys -LoadOrderGroup = Base - -[Strings] -LINUX = "Linux" -GSERIAL = "Gadget Serial" -GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver" --------------------- CUT HERE -------------------- - -The "usbser.sys" file comes with various versions of Windows. -For example, it can be found on Windows XP typically in - - C:\WINDOWS\Driver Cache\i386\driver.cab - -Or it can be found on the Windows 98SE CD in the "win98" folder -in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files. You will -need the DOS "expand" program, the Cygwin "cabextract" program, or -a similar program to unpack these cab files and extract "usbser.sys". - -For example, to extract "usbser.sys" into the current directory -on Windows XP, open a DOS window and run a command like - - expand C:\WINDOWS\Driver~1\i386\driver.cab -F:usbser.sys . - -(Thanks to Nishant Kamat for pointing out this DOS command.) +To use the Windows ACM driver you must have the "linux-cdc-acm.inf" +file (provided along this document) which supports all recent versions +of Windows. When the gadget serial driver is loaded and the USB device connected to the Windows host with a USB cable, Windows should recognize the gadget serial device and ask for a driver. Tell Windows to find the -driver in the folder that contains "gserial.inf" and "usbser.sys". +driver in the folder that contains the "linux-cdc-acm.inf" file. For example, on Windows XP, when the gadget serial device is first plugged in, the "Found New Hardware Wizard" starts up. Select -"Install from a list or specific location (Advanced)", then on -the next screen select "Include this location in the search" and -enter the path or browse to the folder containing "gserial.inf" and -"usbser.sys". Windows will complain that the Gadget Serial driver -has not passed Windows Logo testing, but select "Continue anyway" -and finish the driver installation. +"Install from a list or specific location (Advanced)", then on the +next screen select "Include this location in the search" and enter the +path or browse to the folder containing the "linux-cdc-acm.inf" file. +Windows will complain that the Gadget Serial driver has not passed +Windows Logo testing, but select "Continue anyway" and finish the +driver installation. On Windows XP, in the "Device Manager" (under "Control Panel", "System", "Hardware") expand the "Ports (COM & LPT)" entry and you
@@ -345,5 +280,3 @@ you should be able to send data back and forth between the gadget side and host side systems. Anything you type on the terminal window on the gadget side should appear in the terminal window on the host side and vice versa. - -
Documentation/usb/linux-cdc-acm.inf new file +106 -0
106 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 9/13 USB: gadget: g_multi: added documentation and INF files
A short documentation of the g_multi driver along with INF files for Windows XP SP3 are provided.
--- Documentation/usb/gadget_multi.txt | 149 +++++++++++++++++++++++++++++++++++ Documentation/usb/linux-cdc-acm.inf | 4 +- Documentation/usb/linux-rndis.inf | 6 +- 3 files changed, 154 insertions(+), 5 deletions(-) create mode 100644 Documentation/usb/gadget_multi.txt
Documentation/usb/gadget_multi.txt new file +149 -0
@@ -0,0 +1,149 @@ + -*- org -*- + +* Overview + +The Multifunction Composite Gadget (or g_multi) is a composite gadget +that makes extensive use of the composite framework to provide +a... multifunction gadget. + +In it's standard configuration it provides a single USB configuration +with RNDIS[1] (that is Ethernet), USB CDC[2] ACM (that is serial) and +USB Mass Storage functions. + +A CDC ECM (Ethernet) function may be turned on via a Kconfig option +and RNDIS can be turned off. If they are both enabled the gadget will +have two configurations -- one with RNDIS and another with CDC ECM[3]. + +Please not that if you use non-standard configuration (that is enable +CDC ECM) you may need to change vendor and/or product ID. + +* Host drivers + +To make use of the gadget one needs to make it work on host side -- +without that there's no hope of achieving anything with the gadget. +As one might expect, things one need to do very from system to system. + +** Linux host drivers + +Since the gadget uses standard composite framework and appears as such +to Linux host it does not need any additional drivers on Linux host +side. All the functions are handled by respective drivers developed +for them. + +This is also true for two configuration set-up with RNDIS +configuration being the first one. Linux host will use the second +configuration with CDC ECM which should work better under Linux. + +** Windows host drivers + +For the gadget two work under Windown two conditions have to be met: + +*** Detecting as composite gadget + +First of all, Windows need to detect the gadget as an USB composite +gadget which on its own have some conditions[4]. If they are met, +Windows lets USB Generic Parent Driver[5] handle the device which then +tries to much drivers for each individual interface (sort of, don't +get into too many details). + +The good news is: you do not have to worry about most of the +conditions! + +The only thing to worry is that the gadget has to have a single +configuration so a dual RNDIS and CDC ECM gadget won't work unless you +create a proper INF -- and of course, if you do submit it! + +*** Installing drivers for each function + +The other, trickier thing is making Windows install drivers for each +individual function. + +For mass storage it is trivial since Windows detect it's an interface +implementing USB Mass Storage class and selects appropriate driver. + +Things are harder with RDNIS and CDC ACM. + +**** RNDIS + +To make Windows select RNDIS drivers for the first function in the +gadget, one needs to use the [[file:linux-rndis.inf]] file provided with +this document. It "attaches" Window's RNDIS driver to the first +interface of the gadget. + +Please note, that while testing we encountered some issues[6] when +RNDIS was not the first interface. You do not need to worry abut it +unless you are trying to develop your own gadget in which case watch +out for this bug. + +**** CDC ACM + +Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM. + +**** Customising the gadget + +If you intend to hack the g_multi gadget be advised that rearranging +functions will obviously change interface numbers for each of the +functionality. As an effect provided INFs won't work since they have +interface numbers hard-coded in them (it's not hard to change those +though[7]). + +This also means, that after experimenting with g_multi and changing +provided functions one should change gadget's vendor and/or product ID +so there will be no collision with other customised gadgets or the +original gadget. + +Failing to comply may cause brain damage after wondering for hours why +things don't work as intended before realising Windows have cached +some drivers information (changing USB port may sometimes help plus +you might try using USBDeview[8] to remove the phantom device). + +**** INF testing + +Provided INF files have been tested on Windows XP SP3, Windows Vista +and Windows 7, all 32-bit versions. It should work on 64-bit versions +as well. It most likesy won't work on Windows prior to Windows XP +SP2. + +** Other systems + +At this moment, drivers for any other systems have not been tested. +Knowing how MacOS is based on BSD and BSD is an Open Source it is +believed that it should (read: "I have no idea whether it will") work +out-of-the-box. + +For more exotic systems I have even less to say... + +Any testing and drivers *are* *welcome*! + +* Authors + +This document has been written by Michal Nazarewicz +([[mailto:[email protected]]]) and INF files have been hacked with +support of Marek Szyprowski ([[mailto:[email protected]]]) and +Xiaofan Chen ([[mailto:[email protected]]]) basing on the MS RNDIS +template[9] and Microchip's CDC ACM INF file. + +* Footnotes + +[1] Remote Network Driver Interface Specification, +[[http://msdn.microsoft.com/en-us/library/ee484414.aspx]]. + +[2] Communications Device Class Abstract Control Model, spec for this +and other USB classes can be found at +[[http://www.usb.org/developers/devclass_docs/]]. + +[3] CDC Ethernet Control Model. + +[4] [[http://msdn.microsoft.com/en-us/library/ff537109(v=VS.85).aspx]] + +[5] [[http://msdn.microsoft.com/en-us/library/ff539234(v=VS.85).aspx]] + +[6] To put it in some other nice words, Windows failed to respond to +any user input. + +[7] You may find [[http://www.cygnal.org/ubb/Forum9/HTML/001050.html]] +useful. + +[8] http://www.nirsoft.net/utils/usb_devices_view.html + +[9] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]]
Documentation/usb/linux-cdc-acm.inf +2 -2
@@ -89,10 +89,10 @@ end of the line. [SourceDisksFiles] [SourceDisksNames] [DeviceList] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 [DeviceList.NTamd64] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 ;------------------------------------------------------------------------------
Documentation/usb/linux-rndis.inf +3 -3
@@ -30,15 +30,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 ; Decoration for x86 architecture [RndisDevices.NTx86] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for x64 architecture [RndisDevices.NTamd64] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for ia64 architecture [RndisDevices.NTia64] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ;@@@ This is the common setting for setup [ControlFlags]
Signature · 1 line
1.7.1
PATCH v4 10/13 USB: gadget: g_multi: more configurable
Added Kconfig options for each function used by g_multi so that one can customize the gadget to a greater extend.
Note that it will be wise to change vendor and product ID when customising the gadget.
--- Documentation/usb/gadget_multi.txt | 27 +++--- drivers/usb/gadget/Kconfig | 67 +++++++++----- drivers/usb/gadget/multi.c | 166 ++++++++++++++++-------------------- 3 files changed, 130 insertions(+), 130 deletions(-)
Documentation/usb/gadget_multi.txt +14 -13
@@ -2,20 +2,21 @@ * Overview -The Multifunction Composite Gadget (or g_multi) is a composite gadget -that makes extensive use of the composite framework to provide -a... multifunction gadget. +The Multifunction Composite Gadget (or g_multi) is a customisable +composite gadget that makes extensive use of the composite framework +to provide a... multifunction gadget. In it's standard configuration it provides a single USB configuration with RNDIS[1] (that is Ethernet), USB CDC[2] ACM (that is serial) and USB Mass Storage functions. -A CDC ECM (Ethernet) function may be turned on via a Kconfig option -and RNDIS can be turned off. If they are both enabled the gadget will -have two configurations -- one with RNDIS and another with CDC ECM[3]. +Each function can be disabled via a Kconfig option. There's also +a CDC ECM (Ethernet) function which can be turned on. If CDC ECM and +RNDIS are enabled the gadget will have two configurations -- one with +RNDIS and another with CDC ECM[3]. -Please not that if you use non-standard configuration (that is enable -CDC ECM) you may need to change vendor and/or product ID. +Please not that if you use non-standard configuration you may need to +change vendor and/or product ID. * Host drivers
@@ -81,11 +82,11 @@ Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM. **** Customising the gadget -If you intend to hack the g_multi gadget be advised that rearranging -functions will obviously change interface numbers for each of the -functionality. As an effect provided INFs won't work since they have -interface numbers hard-coded in them (it's not hard to change those -though[7]). +If you intend to customise (via Kconfig) or hack the g_multi gadget be +advised that rearranging functions will obviously change interface +numbers for each of the functionality. As an effect provided INFs +won't work since they have interface numbers hard-coded in them (it's +not hard to change those though[7]). This also means, that after experimenting with g_multi and changing provided functions one should change gadget's vendor and/or product ID
drivers/usb/gadget/Kconfig +43 -24
86 lines not on this page · raw message
drivers/usb/gadget/multi.c +73 -93
242 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 11/13 USB: gadget: composite: addad disconnect callback
Added a disconnect() callback to compasite devices which is called by composite glue when its disconnect callback is called by gadget.
--- drivers/usb/gadget/composite.c | 2 ++ include/linux/usb/composite.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
drivers/usb/gadget/composite.c +2 -0
@@ -956,6 +956,8 @@ static void composite_disconnect(struct usb_gadget *gadget)spin_lock_irqsave (&cdev->lock, flags);if (cdev->config)reset_config (cdev); +if (composite->disconnect) + composite->disconnect (cdev);spin_unlock_irqrestore (&cdev->lock, flags); }
include/linux/usb/composite.h +2 -0
@@ -276,6 +276,8 @@ struct usb_composite_driver {int (*bind)(struct usb_composite_dev *);int (*unbind)(struct usb_composite_dev *); +void (*disconnect)(struct usb_composite_dev *); +/* global suspend hooks */ void (*suspend)(struct usb_composite_dev *);void (*resume)(struct usb_composite_dev *);
Signature · 1 line
1.7.1
PATCH v4 12/13 USB: gadget: f_mass_storage: added eject callback
Added pre_eject() and post_eject() callbacks which are called befor and after removable logical unit is ejected. The first can prevent logical unit from being ejected.
This commit also changes the way callbacks are passed to the function from gadget. A fsg_operations structure has been created which lists all callbacks -- this is passed to the fsg_config.
This is important because it changes the way thread_exits() callback is passed.
--- drivers/usb/gadget/f_mass_storage.c | 109 ++++++++++++++++++++++------------ drivers/usb/gadget/mass_storage.c | 4 +- 2 files changed, 73 insertions(+), 40 deletions(-)
drivers/usb/gadget/f_mass_storage.c +70 -39
@@ -316,6 +316,27 @@ static const char fsg_string_interface[] = "Mass Storage";/*-------------------------------------------------------------------------*/ struct fsg_dev ; +struct fsg_common ; + +/* FSF callback functions */ +struct fsg_operations { +/* Callback function to call when thread exits. If no +* callback is set or it returns value lower then zero MSF +* will force eject all LUNs it operates on (including those +* marked as non-removable or with prevent_medium_removal flag +* set). */ +int (*thread_exits)(struct fsg_common *common); + +/* Called prior to ejection. Negative return means error, +* zero means to continue with ejection, positive means not to +* eject. */ +int (*pre_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +/* Called after ejection. Negative return means error, zero +* or positive is just a success. */ +int (*post_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +};/* Data shared by all the FSG instances. */
@@ -370,8 +391,8 @@ struct fsg_common {struct completion thread_notifier;struct task_struct *thread_task; -/* Callback function to call when thread exits. */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -395,12 +416,8 @@ struct fsg_config {const char *lun_name_format;const char *thread_name; -/* Callback function to call when thread exits. If no -* callback is set or it returns value lower then zero MSF -* will force eject all LUNs it operates on (including those -* marked as non-removable or with prevent_medium_removal flag -* set). */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -436,6 +453,7 @@ static inline int __fsg_is_set(struct fsg_common *common,if (common->fsg)return 1 ;ERROR (common,"common->fsg is NULL in %s at %u\n" , func, line); +WARN_ON (1 );return 0 ; }
@@ -1396,43 +1414,55 @@ static int do_start_stop(struct fsg_common *common) }else if (!curlun->removable) { curlun->sense_data =SS_INVALID_COMMAND ;return -EINVAL ; - } - - loej = common->cmnd[4 ] &0x02 ; - start = common->cmnd[4 ] &0x01 ; - -/* eject code from file_storage.c:do_start_stop() */ - -if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ - (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ + }else if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ + (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; } -if (!start) { -/* Are we allowed to unload the media? */ -if (curlun->prevent_medium_removal) { -LDBG (curlun,"unload attempt prevented\n" ); - curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; -return -EINVAL ; - } -if (loej) {/* Simulate an unload/eject */ -up_read (&common->filesem); -down_write (&common->filesem); -fsg_lun_close (curlun); -up_write (&common->filesem); -down_read (&common->filesem); - } - }else { + loej = common->cmnd[4 ] &0x02 ; + start = common->cmnd[4 ] &0x01 ; -/* Our emulation doesn't support mounting; the medium is -* available for use as soon as it is loaded. */ +/* Our emulation doesn't support mounting; the medium is +* available for use as soon as it is loaded. */ +if (start) {if (!fsg_lun_is_open (curlun)) { curlun->sense_data =SS_MEDIUM_NOT_PRESENT ;return -EINVAL ; } +return 0 ; } -return 0 ; + +/* Are we allowed to unload the media? */ +if (curlun->prevent_medium_removal) { +LDBG (curlun,"unload attempt prevented\n" ); + curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; +return -EINVAL ; + } + +if (!loej) +return 0 ; + +/* Simulate an unload/eject */ +if (common->ops && common->ops->pre_eject) { +int r = common->ops->pre_eject (common, curlun, + curlun - common->luns); +if (unlikely (r <0 )) +return r; +else if (r) +return 0 ; + } + +up_read (&common->filesem); +down_write (&common->filesem); +fsg_lun_close (curlun); +up_write (&common->filesem); +down_read (&common->filesem); + +return common->ops && common->ops->post_eject + ?min (0 , common->ops->post_eject (common, curlun, + curlun - common->luns)) + :0 ; }
@@ -2657,7 +2687,8 @@ static int fsg_main_thread(void *common_) common->thread_task =NULL ;spin_unlock_irq (&common->lock); -if (!common->thread_exits || common->thread_exits (common) <0 ) { +if (!common->ops || !common->ops->thread_exits + || common->ops->thread_exits (common) <0 ) {struct fsg_lun *curlun = common->luns;unsigned i = common->nluns;
@@ -2733,6 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, common->free_storage_on_release =0 ; } + common->ops = cfg->ops; common->private_data = cfg->private_data; common->gadget = gadget;
@@ -2854,7 +2886,6 @@ buffhds_first_it:/* Tell the thread to start working */ - common->thread_exits = cfg->thread_exits; common->thread_task =kthread_create (fsg_main_thread, common,OR (cfg->thread_name,"file-storage" ));
@@ -3151,8 +3182,8 @@ fsg_config_from_params(struct fsg_config *cfg, cfg->product_name =0 ; cfg->release =0xffff ; - cfg->thread_exits =0 ; - cfg->private_data =0 ; + cfg->ops =NULL ; + cfg->private_data =NULL ;/* Finalise */ cfg->can_stall = params->stall;
drivers/usb/gadget/mass_storage.c +3 -1
@@ -153,7 +153,9 @@ static int __init msg_do_config(struct usb_configuration *c) }fsg_config_from_params (&config, &mod_data); - config.thread_exits = msg_thread_exits; + config.ops = &(const struct fsg_operations ){ + .thread_exits = msg_thread_exits, + }; retp =fsg_common_init (&common, c->cdev, &config);if (IS_ERR (retp))
Signature · 1 line
1.7.1
PATCH v4 12/13 USB: gadget: f_mass_storage: added eject callback
Added pre_eject() and post_eject() callbacks which are called befor and after removable logical unit is ejected. The first can prevent logical unit from being ejected.
This commit also changes the way callbacks are passed to the function from gadget. A fsg_operations structure has been created which lists all callbacks -- this is passed to the fsg_config.
This is important because it changes the way thread_exits() callback is passed.
---
Compared to previous patch version fixed the fsg_operations object having automatic instead of static storage.
drivers/usb/gadget/f_mass_storage.c | 109 ++++++++++++++++++++++------------ drivers/usb/gadget/mass_storage.c | 5 +- 2 files changed, 74 insertions(+), 40 deletions(-)
drivers/usb/gadget/f_mass_storage.c +70 -39
@@ -316,6 +316,27 @@ static const char fsg_string_interface[] = "Mass Storage";/*-------------------------------------------------------------------------*/ struct fsg_dev ; +struct fsg_common ; + +/* FSF callback functions */ +struct fsg_operations { +/* Callback function to call when thread exits. If no +* callback is set or it returns value lower then zero MSF +* will force eject all LUNs it operates on (including those +* marked as non-removable or with prevent_medium_removal flag +* set). */ +int (*thread_exits)(struct fsg_common *common); + +/* Called prior to ejection. Negative return means error, +* zero means to continue with ejection, positive means not to +* eject. */ +int (*pre_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +/* Called after ejection. Negative return means error, zero +* or positive is just a success. */ +int (*post_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +};/* Data shared by all the FSG instances. */
@@ -370,8 +391,8 @@ struct fsg_common {struct completion thread_notifier;struct task_struct *thread_task; -/* Callback function to call when thread exits. */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -395,12 +416,8 @@ struct fsg_config {const char *lun_name_format;const char *thread_name; -/* Callback function to call when thread exits. If no -* callback is set or it returns value lower then zero MSF -* will force eject all LUNs it operates on (including those -* marked as non-removable or with prevent_medium_removal flag -* set). */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -436,6 +453,7 @@ static inline int __fsg_is_set(struct fsg_common *common,if (common->fsg)return 1 ;ERROR (common,"common->fsg is NULL in %s at %u\n" , func, line); +WARN_ON (1 );return 0 ; }
@@ -1396,43 +1414,55 @@ static int do_start_stop(struct fsg_common *common) }else if (!curlun->removable) { curlun->sense_data =SS_INVALID_COMMAND ;return -EINVAL ; - } - - loej = common->cmnd[4 ] &0x02 ; - start = common->cmnd[4 ] &0x01 ; - -/* eject code from file_storage.c:do_start_stop() */ - -if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ - (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ + }else if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ + (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; } -if (!start) { -/* Are we allowed to unload the media? */ -if (curlun->prevent_medium_removal) { -LDBG (curlun,"unload attempt prevented\n" ); - curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; -return -EINVAL ; - } -if (loej) {/* Simulate an unload/eject */ -up_read (&common->filesem); -down_write (&common->filesem); -fsg_lun_close (curlun); -up_write (&common->filesem); -down_read (&common->filesem); - } - }else { + loej = common->cmnd[4 ] &0x02 ; + start = common->cmnd[4 ] &0x01 ; -/* Our emulation doesn't support mounting; the medium is -* available for use as soon as it is loaded. */ +/* Our emulation doesn't support mounting; the medium is +* available for use as soon as it is loaded. */ +if (start) {if (!fsg_lun_is_open (curlun)) { curlun->sense_data =SS_MEDIUM_NOT_PRESENT ;return -EINVAL ; } +return 0 ; } -return 0 ; + +/* Are we allowed to unload the media? */ +if (curlun->prevent_medium_removal) { +LDBG (curlun,"unload attempt prevented\n" ); + curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; +return -EINVAL ; + } + +if (!loej) +return 0 ; + +/* Simulate an unload/eject */ +if (common->ops && common->ops->pre_eject) { +int r = common->ops->pre_eject (common, curlun, + curlun - common->luns); +if (unlikely (r <0 )) +return r; +else if (r) +return 0 ; + } + +up_read (&common->filesem); +down_write (&common->filesem); +fsg_lun_close (curlun); +up_write (&common->filesem); +down_read (&common->filesem); + +return common->ops && common->ops->post_eject + ?min (0 , common->ops->post_eject (common, curlun, + curlun - common->luns)) + :0 ; }
@@ -2657,7 +2687,8 @@ static int fsg_main_thread(void *common_) common->thread_task =NULL ;spin_unlock_irq (&common->lock); -if (!common->thread_exits || common->thread_exits (common) <0 ) { +if (!common->ops || !common->ops->thread_exits + || common->ops->thread_exits (common) <0 ) {struct fsg_lun *curlun = common->luns;unsigned i = common->nluns;
@@ -2733,6 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, common->free_storage_on_release =0 ; } + common->ops = cfg->ops; common->private_data = cfg->private_data; common->gadget = gadget;
@@ -2854,7 +2886,6 @@ buffhds_first_it:/* Tell the thread to start working */ - common->thread_exits = cfg->thread_exits; common->thread_task =kthread_create (fsg_main_thread, common,OR (cfg->thread_name,"file-storage" ));
@@ -3151,8 +3182,8 @@ fsg_config_from_params(struct fsg_config *cfg, cfg->product_name =0 ; cfg->release =0xffff ; - cfg->thread_exits =0 ; - cfg->private_data =0 ; + cfg->ops =NULL ; + cfg->private_data =NULL ;/* Finalise */ cfg->can_stall = params->stall;
drivers/usb/gadget/mass_storage.c +4 -1
@@ -143,6 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { +static const struct fsg_operations ops = { + .thread_exits = msg_thread_exits, + };static struct fsg_common common;struct fsg_common *retp;
@@ -155,7 +158,7 @@ static int __init msg_do_config(struct usb_configuration *c) }fsg_config_from_params (&config, &mod_data); - config.thread_exits = msg_thread_exits; + config.ops = &ops; retp =fsg_common_init (&common, c->cdev, &config);if (IS_ERR (retp))
Signature · 1 line
1.7.1
PATCH v4 13/13 USB: gadget: g_multi: Install Mode added
In reply to Michal NazarewiczAdded an Install Mode to the Multifunction Composite Gadget. This mode makes the gadget appear as a mass storage device with first logical unit simulating CD-ROM until an eject on that logical unit is requested because then gadget switches to the "full flagged" gadget.
The intend is that in Install Mode the gadget will provide only a CD-ROM with drivers for host platform. After the drivers are intstalled the gadget will switch to the proper gadget and the newly installed drivers will handle it.
When the device is disconnected form the host machine (or host reboots or whatever that couses suspend or disconnect) the gadget will switch to Install Mode again.
Because disconnect is a normal situation on re-enumeration gadget "ignores" all disconnects and suspends during the first 10 seconds after an eject.
--- Documentation/usb/gadget_multi.txt | 65 ++++- drivers/usb/gadget/Kconfig | 22 ++ drivers/usb/gadget/multi.c | 597 +++++++++++++++++++++++++++++------- 3 files changed, 570 insertions(+), 114 deletions(-)
Documentation/usb/gadget_multi.txt +63 -2
@@ -18,6 +18,11 @@ RNDIS and another with CDC ECM[3]. Please not that if you use non-standard configuration you may need to change vendor and/or product ID. +The driver provides also an "install mode" which you may also call +NoCD ore ZereCD (expect the later is a trademark) which lets one +develop an image with drivers which install automatically on systems +like Windows. + * Host drivers To make use of the gadget one needs to make it work on host side --
@@ -35,6 +40,10 @@ This is also true for two configuration set-up with RNDIS configuration being the first one. Linux host will use the second configuration with CDC ECM which should work better under Linux. +The only exception is when install mode is enabled in which case the +gadget will appear as a plain mass storage device unless it is +ejected. Read appropriate section of this document to find out more. + ** Windows host drivers For the gadget two work under Windown two conditions have to be met:
@@ -116,13 +125,61 @@ For more exotic systems I have even less to say... Any testing and drivers *are* *welcome*! +* Install mode + +The install mode makes the gadget appear as a plain mass storage +device the first time it is connected (and after each disconnect). +This lets one develop an "autorun" CD-ROM image with drivers and put +it as the first logical unit. + +** Workings of the install mode + +As you may know, mass storage gadget may provide several logical units +and its easier to think of them as separate drives. When install mode +is enabled, g_multi forces the first logical unit to be a read-only +CD-ROM. When install mode is enabled but mass storage itself is not +then exactly one logical unit is set. + +When an eject request is made on that logical unit, the file is not +really closed but the gadget switches it's mode to the full flagged +gadget with all the other functions. If mass storage is among them, +the firs logical unit will be the CD-ROM image with drivers (which may +be seen as a bad thing). + +When gadget is disconnected and connected afterwards it will work +again in install mode. Some heuristics are used here -- if +disconnection (or suspend) happens no longer then 10 seconds after +last eject on the first logical unit then on next enumeration gadget +will claim to be full flagged otherwise it'll stick to install mode. + +** Interoperability with host + +As said, the idea behind install mode is that hosts that require +drivers will be able to get them without the need for additional +CD-ROM or another medium provided with the device. + +CD-ROM image should provide an "autorun" functionality witch will +install drivers and eject the emulated CD-ROM to switch gadget into +the other mode which will be handled by newly installed drivers. If +drivers are installed already, they should "catch" the install mode +device by product and vendor IDs and issue an eject. + +This mode is not very Linux-friendly though since Linux and Linux +based systems have no notion of autorun (which from security point of +view is a good thing) and there's no way of adding some file on the +image which will make gadget eject the device. + +Fortunately, there's USB_ModeSwitch[9] and/or udev[10] which +should handle it just fine. A single rule need to be added and +everything should work fine. + * Authors This document has been written by Michal Nazarewicz ([[mailto:[email protected]]]) and INF files have been hacked with support of Marek Szyprowski ([[mailto:[email protected]]]) and Xiaofan Chen ([[mailto:[email protected]]]) basing on the MS RNDIS -template[9] and Microchip's CDC ACM INF file. +template[11] and Microchip's CDC ACM INF file. * Footnotes
@@ -147,4 +204,8 @@ useful. [8] http://www.nirsoft.net/utils/usb_devices_view.html -[9] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]] +[9] [[http://www.draisberghof.de/usb_modeswitch/]] + +[10] [[http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html]] + +[11] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]]
drivers/usb/gadget/Kconfig +22 -0
@@ -921,6 +921,28 @@ config USB_G_MULTI_MSF If unsure, say "y". +config USB_G_MULTI_INSTALL + bool "Install Mode" + depends on USB_G_MULTI && BLOCK + default n + help + This option enables an "Install Mode" configuration. You may + also refer to in as NoCD or ZeroCD (although the later is + a trademark). + + This mode makes gadget appear as an USB Mass Storage device + emulating a CD-ROM the first time it is connected. The intend + is that you can put drivers for your gadget on the disk image. + + When eject request is sent to the logical translation unit + gadget switches its mode to the full flagged gadget with all the + other functions. + + When device is disconnected, gadget once again switches to the + Install Mode configuration. + + If unsure, say "n". + config USB_G_HID tristate "HID Gadget" help
drivers/usb/gadget/multi.c +485 -112
760 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCHv4 11/13] USB: gadget: composite: addad disconnect callback
In reply to Michal NazarewiczQuoted 9 lines · Michal Nazarewicz
From: Michal Nazarewicz <[email protected]>
Subject: [PATCHv4 11/13] USB: gadget: composite: addad disconnect callback
To: [email protected], [email protected]
Cc: "David Brownell" <[email protected]>, "Kyungmin Park" <[email protected]>, "Marek Szyprowski" <[email protected]>, [email protected]
Date: Monday, June 7, 2010, 5:39 AM
Added adisconnect()callback to
compasite devices which
is called by composite glue when its disconnect callback
is called by gadget.
... though I don't recall why I didn't add
this originally; I certainly thought about it.
Quoted 8 lines
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- drivers/usb/gadget/composite.c | 2 ++ include/linux/usb/composite.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
Re: [PATCHv4 10/13] USB: gadget: g_multi: more configurable
In reply to Michal NazarewiczQuoted 4 lines · Michal Nazarewicz
Date: Monday, June 7, 2010, 5:39 AM
AddedKconfigoptions for each
function used byg_multiso that
one can customize the gadget to a greater extend.
For what it's worth ... I still NAK all these complications to what's been intended to be a simple driver.
If you want to create some complex monstrosity, that should have been a different driver.
Unfortunately I see that some such patches have merged despite my previous NAK. Sigh.
Re: [PATCHv4 10/13] USB: gadget: g_multi: more configurable
Quoted 3 lines · Michal Nazarewicz
Quoted 2 lines
Added
Kconfigoptions for each function used byg_multiso that one can customize the gadget to a greater extend.
Quoted 3 lines · David Brownell
For what it's worth ... I still NAK all these complications to what's been intended to be a simple driver.
First of, let me assure you that I didn't want to “go behind your back” or anything.
After your initial NAK I wouldn't bother resending this patch but I wanted to show the install mode feature and stimulate some, I don't know, discussion on how you see things go from here. Sorry if I haven't been clear about my intend.
Also note, that in my opinion all the previous patches in the patchset should be considered all right in this regard since they don't add complexity to the g_multi.
Quoted 2 lines
If you want to create some complex monstrosity, that should have been a different driver.
So, what would you like to see happen?
As I'm working on various features for USB gadgets at the moment I wanted to release them as quickly as possible. Also, new ideas arise long after the original gadget had been created.
Would you prefer I forked g_multi to a g_monstrosity gadget where new features could be developed and tested?
Or do you think that such an experimental, dynamically changed gadget has no place in kernel at all? I don't like that idea as I'd like to share the install mode and maybe other new features with the rest of the word rather then keeping it on my hard drive.
Also, I think that having a configurable gadget may help others test their platform and came up with a gadget they'd like to use by simply changing Kconfig options and testing rather then hacking the file by themselves.
I wanted to reuse g_multi as to not create too many gadgets hence adding features to g_multi in backward compatible fashion.
I'd like to hear you elaborate an that a little so I'd know what's the best course of action here and what I should do from here.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
In reply to Michal NazarewiczQuoted 1 line
+; Copyright (c) 2000 Microsoft Corporation
Same comment as with the INF file for g_ether:
If you're giving Microsoft credit for this, you should make sure we have the right to redistribute the changes ...
To the extent that your patches reduce our ability to redistribute these INF files and thus use these drivers with MS-Windows ... NAK.
It's my understanding that pulling fragments from INF files comes under "fair use" and thus copyright does not need to be assigned. Microsoft publishes these things with the expectation they'll be copied/pasted all over...
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 8 lines · David Brownell
It's my understanding that pulling fragments from INF files comes under "fair use" and thus copyright does not need to be assigned. Microsoft publishes these things with the expectation they'll be copied/pasted all over...
I agree with you here.
Signature · 1 line
Xiaofan http://mcuee.blogspot.com
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
In reply to David BrownellQuoted 12 lines · David Brownell
Quoted 1 line
+; Copyright (c) 2000 Microsoft Corporation
Same comment as with the INF file for
g_ether:If you're giving Microsoft credit for this, you should make sure we have the right to redistribute the changes ...
To the extent that your patches reduce our ability to redistribute these INF files and thus use these drivers with MS-Windows ... NAK.
Quoted 5 lines
It's my understanding that pulling fragments from INF files comes under "fair use" and thus copyright does not need to be assigned. Microsoft publishes these things with the expectation they'll be copied/pasted all over...
So you're saying that removing the copyright will be the way to go? I kept it since it was not really pulling fragments the INF is the whole template provided by Microsoft with some minor changes.
As for RNDIS INF file, my understanding is that since Microsoft provides the template in a publicly available documentation we can assume that we have the right to redistribute code based on it.
As for CDC ACM INF file, my understanding is similar except the template is provided by Microchip rather then Microsoft itself.
I thought it's safer to leave the copyright notice and assume we have the right to modify and redistribute rather then remove it and then be accused of claiming other's copyright.
All lawyers in the room please rise hands? ;)
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
2010/6/9 Michał Nazarewicz <[email protected]>:
Quoted 3 lines
As for CDC ACM INF file, my understanding is similar except the template is provided by Microchip rather then Microsoft itself.
Actually Microchip is also copying from Microsoft's template. I could not find the CDC-ACM inf template from Microsoft website now but I clearly remember I saw it somewhere.
Other companies does not really put Copyrights on the inf file for usbser.sys, for example, look at the following file from ST.
http://www.st.com/stonline/books/pdf/docs/12571.pdf (page 5).
Another example (old format).
http://www.lvr.com/files/usbcomport.txt
So it is probably okay to drop the copyright line. On the other hand, even if there is the copyright line from Microsoft, I think you can still redistribute it. But I am not a lawyer but a hardware engineer. ;-)
Signature · 1 line
Xiaofan http://mcuee.blogspot.com
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 3 lines
2010/6/9 Michał Nazarewicz <[email protected]>:
Quoted 2 lines
As for CDC ACM INF file, my understanding is similar except the template is provided by Microchip rather then Microsoft itself.
Quoted 5 lines · Xiaofan Chen
So it is probably okay to drop the copyright line. On the other hand, even if there is the copyright line from Microsoft, I think you can still redistribute it.
But I am not a lawyer but a hardware engineer. ;-)
I think we all have the same problem here. ;)
I dunno, obviously I want to make everything according to law to avoid any problems. Maybe we should contact someone at The Software Freedom Law Center or some similar entity?
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 9 lines · Michał Nazarewicz
Quoted 3 lines
2010/6/9 Michał Nazarewicz <[email protected]>:
Quoted 2 lines
As for CDC ACM INF file, my understanding is similar except the template is provided by Microchip rather then Microsoft itself.
Quoted 3 lines · Xiaofan Chen
So it is probably okay to drop the copyright line. On the other hand, even if there is the copyright line from Microsoft, I think you can still redistribute it.
Quoted 7 lines
Quoted 1 line
But I am not a lawyer but a hardware engineer. ;-)
I think we all have the same problem here. ;)
I dunno, obviously I want to make everything according to law to avoid any problems. Maybe we should contact someone at The Software Freedom Law Center or some similar entity?
Ick, no, that's not needed here.
Take the copyright off if this is something that _you_ wrote. If you copied it from somewhere and modified it, say where you copied it from, and show the rights that allowed you to copy it.
Where exactly did you get it from originally?
thanks,
greg k-h
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 3 lines
Quoted 3 lines
I dunno, obviously I want to make everything according to law to avoid any problems. Maybe we should contact someone at The Software Freedom Law Center or some similar entity?
Quoted 1 line · Greg KH
Ick, no, that's not needed here.
Still I had a chat on IRC with a person who knows copyright law rather well[1] which pointed me to a few things. ;)
Quoted 5 lines
Take the copyright off if this is something that _you_ wrote. If you copied it from somewhere and modified it, say where you copied it from, and show the rights that allowed you to copy it.
Where exactly did you get it from originally?
The RNDIS template was taken from:
http://msdn.microsoft.com/en-us/library/ff570620.aspx
The CDC ACM was sent by Xiaofan Chen who said that it is probably taken indirectly form MSDN as well.
The MSDN TOS reads:
Quoted 3 lines
If Microsoft makes any code marked as “sample” available on this Web Site without a License Agreement, then that code is licensed to you under the terms of the Microsoft Limited Public License.
Where the MLPL can be found at:
<http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. It seems like a perfectly legal free software license except point 3(F):
Quoted 3 lines
(F) Platform Limitation- The licenses granted in sections 2(A) & 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product.
Also, 3(D) requires that the whole license is included:
Quoted 5 lines
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
Therefore, shall we include the license along with the INFs and ignore the fact it's not fully free software?
_______________________________________________________________________
[1] I'm deliberately not using the word "lawyer" here not I give the person's name as to not make an impression that it was a legal advice or to make him in any way liable. This was *not* a legal advice.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 15 lines · Michał Nazarewicz
Quoted 3 lines
Quoted 3 lines
I dunno, obviously I want to make everything according to law to avoid any problems. Maybe we should contact someone at The Software Freedom Law Center or some similar entity?
Quoted 1 line · Greg KH
Ick, no, that's not needed here.
Still I had a chat on IRC with a person who knows copyright law rather well[1] which pointed me to a few things. ;)
Quoted 4 lines
Take the copyright off if this is something that _you_ wrote. If you copied it from somewhere and modified it, say where you copied it from, and show the rights that allowed you to copy it.
Quoted 7 lines
Quoted 1 line
Where exactly did you get it from originally?
The RNDIS template was taken from:
http://msdn.microsoft.com/en-us/library/ff570620.aspxThe CDC ACM was sent by Xiaofan Chen who said that it is probably taken indirectly form MSDN as well.
Ok, and not from the Windows DDK, right? That has a different license than MSDN.
Quoted 14 lines
The MSDN TOS reads:
Quoted 3 lines
If Microsoft makes any code marked as “sample” available on this Web Site without a License Agreement, then that code is licensed to you under the terms of the Microsoft Limited Public License.
Where the MLPL can be found at:
<http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. It seems like a perfectly legal free software license except point 3(F):Quoted 3 lines
(F) Platform Limitation- The licenses granted in sections 2(A) & 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product.
Also, 3(D) requires that the whole license is included:
Quoted 8 lines
Quoted 5 lines
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
Therefore, shall we include the license along with the INFs and ignore the fact it's not fully free software?
No, it's not "software" here, and it is abiding by the license of the MLPL as you don't run that file on any non-Windows machine.
How about putting the following on the file:
; based on a example .inf file that was:
; Copyright (c) Microsoft Corporation
; and released under the MLPL as found at ; http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL
; For use only on Windows operating systems. ;
Interesting that they don't put a date on the copyright.
With that wording, I'd be glad to take it.
thanks,
greg k-h
Re: [PATCHv4 08/13] USB: gadget: g_serial: INF file updated
Quoted 8 lines · Greg KH
Quoted 5 lines
The RNDIS template was taken from:
http://msdn.microsoft.com/en-us/library/ff570620.aspxThe CDC ACM was sent by Xiaofan Chen who said that it is probably taken indirectly form MSDN as well.
Ok, and not from the Windows DDK, right? That has a different license than MSDN.
RNDIS is from MSDN for sure. As of serial, I couldn't find it there.
Quoted 20 lines
Quoted 20 lines
The MSDN TOS reads:
Quoted 3 lines
If Microsoft makes any code marked as “sample” available on this Web Site without a License Agreement, then that code is licensed to you under the terms of the Microsoft Limited Public License.
Where the MLPL can be found at:
<http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. It seems like a perfectly legal free software license except point 3(F):Quoted 3 lines
(F) Platform Limitation- The licenses granted in sections 2(A) & 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product.
Also, 3(D) requires that the whole license is included:
Quoted 5 lines
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
Quoted 5 lines
Quoted 2 lines
Therefore, shall we include the license along with the INFs and ignore the fact it's not fully free software?
No, it's not "software" here, and it is abiding by the license of the MLPL as you don't run that file on any non-Windows machine.
Well... According to the license (if we assume the license apply to the INF template) it is "software":
Quoted 4 lines
This license governs use of code marked as “sample” available on this Web Site without a License Agreement , as provided under the Section above titled “NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE”. If you use such code (the “software”), you accept this license.
Quoted 11 lines · Greg KH
How about putting the following on the file:
; based on a example .inf file that was:
; Copyright (c) Microsoft Corporation
; and released under the MLPL as found at ; http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL
; For use only on Windows operating systems. ;Interesting that they don't put a date on the copyright.
With that wording, I'd be glad to take it.
If no one sees any legal issues here I can change the patch accordingly. I'm more and more confused by the whole issue. ;)
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
PATCH 1/1 USB: gadget: g_fs: code cleanup and bug fixes
In reply to Michal NazarewiczThis commit cleans the g_fs gadget hopefully making it more readable. This is achieved by usage of the usb_string_ids_tab() function for bulk string IDs registration as well as generalising provided configuration so that a single routine is used to add each configuration and bind interfaces. As an effect, the code is shorter and has fewer #ifdefs.
Also, a bug has been fixed where bConfigurationValue were not affected by what configuration user chose to compile in via Kconfig option. As an effect, RDNIS and ECM were always number 1 and the "pure" configuration was always number 2.
---
Requires "USB: gadget: composite: usb_string_ids_*() functions added" patch to work.
drivers/usb/gadget/Kconfig | 23 +++--- drivers/usb/gadget/g_ffs.c | 174 ++++++++++++-------------------------------- 2 files changed, 60 insertions(+), 137 deletions(-)
drivers/usb/gadget/Kconfig +12 -11
@@ -750,6 +750,7 @@ config USB_GADGETFS config USB_FUNCTIONFS tristate "Function Filesystem (EXPERIMENTAL)" depends on EXPERIMENTAL + select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS) help The Function Filesystem (FunctioFS) lets one create USB composite functions in user space in the same way as GadgetFS
@@ -758,31 +759,31 @@ config USB_FUNCTIONFS implemented in kernel space (for instance Ethernet, serial or mass storage) and other are implemented in user space. + If you say "y" or "m" here you will be able what kind of + configurations the gadget will provide. + Say "y" to link the driver statically, or "m" to build a dynamically linked module called "g_ffs". config USB_FUNCTIONFS_ETH - bool "Include CDC ECM (Ethernet) function" + bool "Include configuration with CDC ECM (Ethernet)" depends on USB_FUNCTIONFS && NET help - Include an CDC ECM (Ethernet) funcion in the CDC ECM (Funcion) - Filesystem. If you also say "y" to the RNDIS query below the - gadget will have two configurations. + Include a configuration with CDC ECM funcion (Ethernet) and the + Funcion Filesystem. config USB_FUNCTIONFS_RNDIS - bool "Include RNDIS (Ethernet) function" + bool "Include configuration with RNDIS (Ethernet)" depends on USB_FUNCTIONFS && NET help - Include an RNDIS (Ethernet) funcion in the Funcion Filesystem. - If you also say "y" to the CDC ECM query above the gadget will - have two configurations. + Include a configuration with RNDIS funcion (Ethernet) and the Filesystem. config USB_FUNCTIONFS_GENERIC bool "Include 'pure' configuration" - depends on USB_FUNCTIONFS && (USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS) + depends on USB_FUNCTIONFS help - Include a configuration with FunctionFS and no Ethernet - configuration. + Include a configuration with the Function Filesystem alone with + no Ethernet interface. config USB_FILE_STORAGE tristate "File-backed Storage Gadget"
drivers/usb/gadget/g_ffs.c +48 -126
261 lines not on this page · raw message
Signature · 1 line
1.7.1
Quoted 11 lines · Michal Nazarewicz
Hello again,
After comments from Xiaofan Chen I updated the INF files used in provious patchset. As a matter of fact I've replaced the linux.inf file used so far for RNDIS and comments in gadget_serial.txt.
Other then that, there are only a few changes to the gadget_multi.txt file suggested by Xiaofan.
The other patches are the same as with previous version of the patchset:
Can you resend this the 5th time so I know I have all of the proper versions?
thanks,
greg k-h
v5 cover g_multi & other improvements and cleanpus
Quoted 2 lines · Greg KH
Can you resend this the 5th time so I know I have all of the proper versions?
As requested resending the whole patchset again.
Compared to the previous comments in RNDIS and CDC ACM INF files have been updated (the RNDIS fix was previously sent as v4.1 but this patchset includes a bit updated version) and a little fix to patch 01 has been applied (already sent as version v4.1).
The g_multi "more configuration" and install mode has been exluded from this patches -- they weren't ment for inclusien in the kernel in th elast patchset (just to show them), so no point in including here (if aynone interested refer to v4 patches 10/13 and 13/13).
I wasn't sure 100% sure what wording to use in the CDC ACM INF file so I put something that is likely to be true and safe. ;) I posted on m.p.d.d.d and contactec Microchip so maybe there will be some more info.
Michal Nazarewicz (11):
USB: gadget: g_mass_storage: static data instead of dynamic
allocation
USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
USB: gadget: f_fs: functionfs_add() renamed to
functionfs_bind_config()
USB: gadget: composite: usb_string_ids_*() functions added
USB: gadget: f_fs: use usb_string_ids_n()
USB: gadget: g_multi: code clean up and refactoring
USB: gadget: g_ether: updated INF file
USB: gadget: g_serial: INF file updated
USB: gadget: g_multi: added documentation and INF files
USB: gadget: composite: addad disconnect callback
USB: gadget: f_mass_storage: added eject callback
Documentation/usb/gadget_multi.txt | 150 ++++++++++++++++++++ Documentation/usb/gadget_serial.txt | 87 ++---------- Documentation/usb/linux-cdc-acm.inf | 107 ++++++++++++++ Documentation/usb/linux.inf | 236 +++++++------------------------ drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/composite.c | 73 +++++++++- drivers/usb/gadget/f_fs.c | 36 ++--- drivers/usb/gadget/f_mass_storage.c | 122 +++++++++++------ drivers/usb/gadget/g_ffs.c | 2 +- drivers/usb/gadget/mass_storage.c | 20 ++- drivers/usb/gadget/multi.c | 262 ++++++++++++++++++++--------------- include/linux/usb/composite.h | 6 + include/linux/usb/functionfs.h | 6 +- 13 files changed, 654 insertions(+), 454 deletions(-) create mode 100644 Documentation/usb/gadget_multi.txt create mode 100644 Documentation/usb/linux-cdc-acm.inf
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Micha흢 "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
PATCH v5 1/11 USB: gadget: g_mass_storage: static data instead of dynamic allocation
This patch changes msg_do_config() function so that it uses a static object for a fsg_common structure instead of dynamically allocated. This is a micro-optimisation.
--- drivers/usb/gadget/mass_storage.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/usb/gadget/mass_storage.c +9 -6
@@ -143,7 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { -struct fsg_common *common; +static struct fsg_common common; + +struct fsg_common *retp;struct fsg_config config;int ret;
@@ -154,12 +156,13 @@ static int __init msg_do_config(struct usb_configuration *c)fsg_config_from_params (&config, &mod_data); config.thread_exits = msg_thread_exits; - common =fsg_common_init (0 , c->cdev, &config); -if (IS_ERR (common)) -return PTR_ERR (common); - ret =fsg_add (c->cdev, c, common); -fsg_common_put (common); + retp =fsg_common_init (&common, c->cdev, &config); +if (IS_ERR (retp)) +return PTR_ERR (retp); + + ret =fsg_add (c->cdev, c, &common); +fsg_common_put (&common);return ret; }
Signature · 1 line
1.7.1
PATCH v5 2/11 USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
Mass Storage Function had a bit unique name for function used to add it to USB configuration. Renamed as to match naming convention of other functions.
--- drivers/usb/gadget/f_mass_storage.c | 13 ++++++++++--- drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/multi.c | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-)
drivers/usb/gadget/f_mass_storage.c +10 -3
@@ -3023,9 +3023,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = { NULL, }; -static int fsg_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct fsg_common *common) +static int fsg_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct fsg_common *common) {struct fsg_dev *fsg;int rc;
@@ -3072,6 +3072,13 @@ error_free_fsg:return rc; } +static inline int __deprecated __maybe_unused +fsg_add (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct fsg_common *common) +{ +return fsg_bind_config (cdev, c, common); +}/************************* Module parameters *************************/
drivers/usb/gadget/mass_storage.c +1 -1
@@ -161,7 +161,7 @@ static int __init msg_do_config(struct usb_configuration *c)if (IS_ERR (retp))return PTR_ERR (retp); - ret =fsg_add (c->cdev, c, &common); + ret =fsg_bind_config (c->cdev, c, &common);fsg_common_put (&common);return ret; }
drivers/usb/gadget/multi.c +2 -2
@@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)if (ret <0 )return ret; - ret =fsg_add (c->cdev, c, fsg_common); + ret =fsg_bind_config (c->cdev, c, fsg_common);if (ret <0 )return ret;
@@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)if (ret <0 )return ret; - ret =fsg_add (c->cdev, c, fsg_common); + ret =fsg_bind_config (c->cdev, c, fsg_common);if (ret <0 )return ret;
Signature · 1 line
1.7.1
PATCH v5 3/11 USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
FunctionFS had a bit unique name for function used to add it to USB configuration. Renamed as to match naming convention of other functions.
--- drivers/usb/gadget/f_fs.c | 6 +++--- drivers/usb/gadget/g_ffs.c | 2 +- include/linux/usb/functionfs.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/gadget/f_fs.c +3 -3
@@ -1480,9 +1480,9 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count) } -static int functionfs_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct ffs_data *ffs) +static int functionfs_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct ffs_data *ffs) {struct ffs_function *func;int ret;
drivers/usb/gadget/g_ffs.c +1 -1
@@ -388,7 +388,7 @@ static int __gfs_do_config(struct usb_configuration *c,return ret; } - ret =functionfs_add (c->cdev, c, gfs_ffs_data); + ret =functionfs_bind_config (c->cdev, c, gfs_ffs_data);if (unlikely (ret <0 ))return ret;
include/linux/usb/functionfs.h +3 -3
@@ -180,9 +180,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)static void functionfs_unbind (struct ffs_data *ffs) __attribute__((nonnull)); -static int functionfs_add (struct usb_composite_dev *cdev, -struct usb_configuration *c, -struct ffs_data *ffs) +static int functionfs_bind_config (struct usb_composite_dev *cdev, +struct usb_configuration *c, +struct ffs_data *ffs) __attribute__((warn_unused_result, nonnull));
Signature · 1 line
1.7.1
PATCH v5 4/11 USB: gadget: composite: usb_string_ids_*() functions added
usb_string_ids_tab() and usb_string_ids_n() functions added to the composite framework. The first accepts an array of usb_string object and for each registeres a string id and the second registeres a given number of ids and returns the first.
This may simplify string ids registration since gadgets and composite functions won't have to call usb_string_id() several times and each time check for errer status -- all this will be done with a single call.
--- drivers/usb/gadget/composite.c | 71 +++++++++++++++++++++++++++++++++++++-- include/linux/usb/composite.h | 4 ++ 2 files changed, 71 insertions(+), 4 deletions(-)
drivers/usb/gadget/composite.c +67 -4
@@ -673,20 +673,83 @@ static int get_string(struct usb_composite_dev *cdev,* string IDs. Drivers for functions, configurations, or gadgets will * then store that ID in the appropriate descriptors and string table. * -* All string identifier should be allocated using this routine, to -* ensure that for example different functions don't wrongly assign -* different meanings to the same identifier. +* All string identifier should be allocated using this, +* @usb_string_ids_tab() or @usb_string_ids_n() routine, to ensure +* that for example different functions don't wrongly assign different +* meanings to the same identifier. */ int usb_string_id (struct usb_composite_dev *cdev) {if (cdev->next_string_id <254 ) { -/* string id 0 is reserved */ +/* string id 0 is reserved by USB spec for list of +* supported languages */ +/* 255 reserved as well? -- mina86 */ cdev->next_string_id++;return cdev->next_string_id; }return -ENODEV ; } +/** +* usb_string_ids() - allocate unused string IDs in batch +* @cdev: the device whose string descriptor IDs are being allocated +* @str: an array of usb_string objects to assign numbers to +* Context: single threaded during gadget setup +* +* @usb_string_ids() is called from bind() callbacks to allocate +* string IDs. Drivers for functions, configurations, or gadgets will +* then copy IDs from the string table to the appropriate descriptors +* and string table for other languages. +* +* All string identifier should be allocated using this, +* @usb_string_id() or @usb_string_ids_n() routine, to ensure that for +* example different functions don't wrongly assign different meanings +* to the same identifier. +*/ +int usb_string_ids_tab (struct usb_composite_dev *cdev,struct usb_string *str) +{ +int next = cdev->next_string_id; + +for (; str->s; ++str) { +if (unlikely (next >=254 )) +return -ENODEV ; + str->id = ++next; + } + + cdev->next_string_id = next; + +return 0 ; +} + +/** +* usb_string_ids_n() - allocate unused string IDs in batch +* @cdev: the device whose string descriptor IDs are being allocated +* @n: number of string IDs to allocate +* Context: single threaded during gadget setup +* +* Returns the first requested ID. This ID and next @n-1 IDs are now +* valid IDs. At least providind that @n is non zore because if it +* is, returns last requested ID which is now very useful information. +* +* @usb_string_ids_n() is called from bind() callbacks to allocate +* string IDs. Drivers for functions, configurations, or gadgets will +* then store that ID in the appropriate descriptors and string table. +* +* All string identifier should be allocated using this, +* @usb_string_id() or @usb_string_ids_n() routine, to ensure that for +* example different functions don't wrongly assign different meanings +* to the same identifier. +*/ +int usb_string_ids_n (struct usb_composite_dev *c,unsigned n) +{ +unsigned next = c->next_string_id; +if (unlikely (n >254 || (unsigned )next + n >254 )) +return -ENODEV ; + c->next_string_id += n; +return next +1 ; +} + +/*-------------------------------------------------------------------------*/ static void composite_setup_complete (struct usb_ep *ep,struct usb_request *req)
include/linux/usb/composite.h +4 -0
@@ -342,6 +342,10 @@ struct usb_composite_dev { };extern int usb_string_id (struct usb_composite_dev *c); +extern int usb_string_ids_tab (struct usb_composite_dev *c, +struct usb_string *str); +extern int usb_string_ids_n (struct usb_composite_dev *c,unsigned n); +/* messaging utils */ #define DBG(d, fmt, args...) \
Signature · 1 line
1.7.1
PATCH v5 5/11 USB: gadget: f_fs: use usb_string_ids_n()
Use usb_string_ids_n() function to simplify string ids registeration.
--- drivers/usb/gadget/f_fs.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-)
drivers/usb/gadget/f_fs.c +12 -18
@@ -1377,7 +1377,8 @@ static void ffs_data_reset(struct ffs_data *ffs)static int functionfs_bind (struct ffs_data *ffs,struct usb_composite_dev *cdev) { -unsigned i, count; +struct usb_gadget_strings **lang; +int first_id;ENTER ();
@@ -1385,7 +1386,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) || test_and_set_bit(FFS_FL_BOUND, &ffs->flags)))return -EBADFD ; -ffs_data_get (ffs); + first_id =usb_string_ids_n (cdev, ffs->strings_count); +if (unlikely (first_id <0 )) +return first_id; ffs->ep0req =usb_ep_alloc_request (cdev->gadget->ep0,GFP_KERNEL );if (unlikely (!ffs->ep0req))
@@ -1393,25 +1396,16 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) ffs->ep0req->complete = ffs_ep0_complete; ffs->ep0req->context = ffs; -/* Get strings identifiers */ -for (count = ffs->strings_count, i =0 ; i < count; ++i) { -struct usb_gadget_strings **lang; - -int id =usb_string_id (cdev); -if (unlikely (id <0 )) { -usb_ep_free_request (cdev->gadget->ep0, ffs->ep0req); - ffs->ep0req =NULL ; -return id; - } - - lang = ffs->stringtabs; -do { - (*lang)->strings[i].id = id; - ++lang; - }while (*lang); + lang = ffs->stringtabs; +for (lang = ffs->stringtabs; *lang; ++lang) { +struct usb_string *str = (*lang)->strings; +int id = first_id; +for (; str->s; ++id, ++str) + str->id = id; } ffs->gadget = cdev->gadget; +ffs_data_get (ffs);return 0 ; }
Signature · 1 line
1.7.1
PATCH v5 6/11 USB: gadget: g_multi: code clean up and refactoring
The Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
--- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/multi.c | 262 +++++++++++++++++++++++++------------------- 2 files changed, 148 insertions(+), 115 deletions(-)
drivers/usb/gadget/Kconfig +1 -0
@@ -863,6 +863,7 @@ config USB_G_NOKIA config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NET + select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial link
drivers/usb/gadget/multi.c +147 -115
404 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 7/11 USB: gadget: g_ether: updated INF file
Updated the INF file for the g_ether gadegt. It should work with most recent Windows systems now. The file hase been also renamed to linux-rndis.inf rather then linux.inf.
--- Documentation/usb/linux.inf | 236 ++++++++++--------------------------------- 1 files changed, 52 insertions(+), 184 deletions(-)
Documentation/usb/linux.inf +52 -184
@@ -1,200 +1,68 @@ -; MS-Windows driver config matching some basic modes of the -; Linux-USB Ethernet/RNDIS gadget firmware: -; -; - RNDIS plus CDC Ethernet ... this may be familiar as a DOCSIS -; cable modem profile, and supports most non-Microsoft USB hosts -; -; - RNDIS plus CDC Subset ... used by hardware that incapable of -; full CDC Ethernet support. -; -; Microsoft only directly supports RNDIS drivers, and bundled them into XP. -; The Microsoft "Remote NDIS USB Driver Kit" is currently found at: -; http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx - +; Based on template INF file found at +; <http://msdn.microsoft.com/en-us/library/ff570620.aspx> +; which was: +; Copyright (c) Microsoft Corporation +; and released under the MLPL as found at: +; <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. +; For use only on Windows operating systems. [Version] -Signature = "$CHICAGO$" +Signature = "$Windows NT$" Class = Net ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} Provider = %Linux% -Compatible = 1 -MillenniumPreferred = .ME -DriverVer = 03/30/2004,0.0.0.0 -; catalog file would be used by WHQL -;CatalogFile = Linux.cat +DriverVer = 06/21/2006,6.0.6000.16384 +;CatalogFile = device.cat [Manufacturer] -%Linux% = LinuxDevices,NT.5.1 +%Linux% = RndisDevices,NTx86,NTamd64,NTia64 + +; Decoration for x86 architecture +[RndisDevices.NTx86] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices] -; NetChip IDs, used by both firmware modes -%LinuxDevice% = RNDIS, USB\VID_0525&PID_a4a2 +; Decoration for x64 architecture +[RndisDevices.NTamd64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices.NT.5.1] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +; Decoration for ia64 architecture +[RndisDevices.NTia64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; Windows 98, Windows 98 Second Edition specific sections -------- - -[RNDIS] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_98, RNDIS_AddReg_Common - -[RNDIS_AddReg_98] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_98" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_98] -CopyFiles=RNDIS_CopyFiles_98 - -[RNDIS_CopyFiles_98] -usb8023.sys, usb8023w.sys, , 0 -rndismp.sys, rndismpw.sys, , 0 - -; Windows Millennium Edition specific sections -------------------- - -[RNDIS.ME] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_ME, RNDIS_AddReg_Common -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 - -[RNDIS_AddReg_ME] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_ME" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_ME] -CopyFiles=RNDIS_CopyFiles_ME - -[RNDIS_CopyFiles_ME] -usb8023.sys, usb8023m.sys, , 0 -rndismp.sys, rndismpm.sys, , 0 - -; Windows 2000 specific sections --------------------------------- - -[RNDIS.NT] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -CopyFiles = RNDIS_CopyFiles_NT - -[RNDIS.NT.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_NT, RNDIS_EventLog - -[RNDIS_CopyFiles_NT] -; no rename of files on Windows 2000, use the 'k' names as is -usb8023k.sys, , , 0 -rndismpk.sys, , , 0 - -[RNDIS_ServiceInst_NT] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023k.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_NT - -[RNDIS_WMI_AddReg_NT] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismpk.sys" - -; Windows XP specific sections ----------------------------------- - +; DDInstall section +; References the in-build Netrndis.inf [RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -; no copyfiles - the files are already in place - +Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType = 15 +; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF +include = netrndis.inf +needs = Usb_Rndis.ndi +AddReg = Rndis_AddReg_Vista + +; DDInstal.Services section [RNDIS.NT.5.1.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_51, RNDIS_EventLog - -[RNDIS_ServiceInst_51] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_51 - -[RNDIS_WMI_AddReg_51] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismp.sys" - -; Windows 2000 and Windows XP common sections -------------------- - -[RNDIS_AddReg_NT] -HKR, Ndi, Service, 0, "USB_RNDIS" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" - -[RNDIS_EventLog] -AddReg = RNDIS_EventLog_AddReg - -[RNDIS_EventLog_AddReg] -HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll" -HKR, , TypesSupported, 0x00010001, 7 - -; Common Sections ------------------------------------------------- - -[RNDIS_AddReg_Common] -HKR, NDI\params\NetworkAddress, ParamDesc, 0, %NetworkAddress% -HKR, NDI\params\NetworkAddress, type, 0, "edit" -HKR, NDI\params\NetworkAddress, LimitText, 0, "12" -HKR, NDI\params\NetworkAddress, UpperCase, 0, "1" -HKR, NDI\params\NetworkAddress, default, 0, " " -HKR, NDI\params\NetworkAddress, optional, 0, "1" - -[SourceDisksNames] -1=%SourceDisk%,,1 - -[SourceDisksFiles] -usb8023m.sys=1 -rndismpm.sys=1 -usb8023w.sys=1 -rndismpw.sys=1 -usb8023k.sys=1 -rndismpk.sys=1 - -[DestinationDirs] -RNDIS_CopyFiles_98 = 10, system32/drivers -RNDIS_CopyFiles_ME = 10, system32/drivers -RNDIS_CopyFiles_NT = 12 - +include = netrndis.inf +needs = Usb_Rndis.ndi.Services + +; Optional registry settings. You can modify as needed. +[RNDIS_AddReg_Vista] +HKR, NDI\params\VistaProperty, ParamDesc, 0, %Vista_Property% +HKR, NDI\params\VistaProperty, type, 0, "edit" +HKR, NDI\params\VistaProperty, LimitText, 0, "12" +HKR, NDI\params\VistaProperty, UpperCase, 0, "1" +HKR, NDI\params\VistaProperty, default, 0, " " +HKR, NDI\params\VistaProperty, optional, 0, "1" + +; No sys copyfiles - the sys files are already in-build +; (part of the operating system). +; We do not support XP SP1-, 2003 SP1-, ME, 9x. + +; Modify these strings for your device as needed. [Strings] -ServiceDisplayName = "USB Remote NDIS Network Device Driver" -NetworkAddress = "Network Address" -Linux = "Linux Developer Community" -LinuxDevice = "Linux USB Ethernet/RNDIS Gadget" -SourceDisk = "Ethernet/RNDIS Gadget Driver Install Disk" - +Linux = "Linux Developer Community" +RndisDevice = "Ethernet/RNDIS Gadget" +Vista_Property = "Optional Vista Property"
Signature · 1 line
1.7.1
PATCH v5 8/11 USB: gadget: g_serial: INF file updated
Updated the INF file for g_serial gadget. It should work with most recent Windows systems now.
--- Documentation/usb/gadget_serial.txt | 87 +++------------------------- Documentation/usb/linux-cdc-acm.inf | 107 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 77 deletions(-) create mode 100644 Documentation/usb/linux-cdc-acm.inf
Documentation/usb/gadget_serial.txt +10 -77
@@ -151,88 +151,23 @@ instructions below to install the host side driver. Installing the Windows Host ACM Driver -------------------------------------- -To use the Windows ACM driver you must have the files "gserial.inf" -and "usbser.sys" together in a folder on the Windows machine. - -The "gserial.inf" file is given here. - --------------------- CUT HERE -------------------- -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%LINUX% -DriverVer=08/17/2004,0.0.2.0 -; Copyright (C) 2004 Al Borchers ([email protected]) - -[Manufacturer] -%LINUX%=GSerialDeviceList - -[GSerialDeviceList] -%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7 - -[DestinationDirs] -DefaultDestDir=10,System32\Drivers - -[GSerialInstall] -CopyFiles=GSerialCopyFiles -AddReg=GSerialAddReg - -[GSerialCopyFiles] -usbser.sys - -[GSerialAddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[GSerialInstall.Services] -AddService = usbser,0x0002,GSerialService - -[GSerialService] -DisplayName = %GSERIAL_DISPLAY_NAME% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %10%\System32\Drivers\usbser.sys -LoadOrderGroup = Base - -[Strings] -LINUX = "Linux" -GSERIAL = "Gadget Serial" -GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver" --------------------- CUT HERE -------------------- - -The "usbser.sys" file comes with various versions of Windows. -For example, it can be found on Windows XP typically in - - C:\WINDOWS\Driver Cache\i386\driver.cab - -Or it can be found on the Windows 98SE CD in the "win98" folder -in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files. You will -need the DOS "expand" program, the Cygwin "cabextract" program, or -a similar program to unpack these cab files and extract "usbser.sys". - -For example, to extract "usbser.sys" into the current directory -on Windows XP, open a DOS window and run a command like - - expand C:\WINDOWS\Driver~1\i386\driver.cab -F:usbser.sys . - -(Thanks to Nishant Kamat for pointing out this DOS command.) +To use the Windows ACM driver you must have the "linux-cdc-acm.inf" +file (provided along this document) which supports all recent versions +of Windows. When the gadget serial driver is loaded and the USB device connected to the Windows host with a USB cable, Windows should recognize the gadget serial device and ask for a driver. Tell Windows to find the -driver in the folder that contains "gserial.inf" and "usbser.sys". +driver in the folder that contains the "linux-cdc-acm.inf" file. For example, on Windows XP, when the gadget serial device is first plugged in, the "Found New Hardware Wizard" starts up. Select -"Install from a list or specific location (Advanced)", then on -the next screen select "Include this location in the search" and -enter the path or browse to the folder containing "gserial.inf" and -"usbser.sys". Windows will complain that the Gadget Serial driver -has not passed Windows Logo testing, but select "Continue anyway" -and finish the driver installation. +"Install from a list or specific location (Advanced)", then on the +next screen select "Include this location in the search" and enter the +path or browse to the folder containing the "linux-cdc-acm.inf" file. +Windows will complain that the Gadget Serial driver has not passed +Windows Logo testing, but select "Continue anyway" and finish the +driver installation. On Windows XP, in the "Device Manager" (under "Control Panel", "System", "Hardware") expand the "Ports (COM & LPT)" entry and you
@@ -345,5 +280,3 @@ you should be able to send data back and forth between the gadget side and host side systems. Anything you type on the terminal window on the gadget side should appear in the terminal window on the host side and vice versa. - -
Documentation/usb/linux-cdc-acm.inf new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 9/11 USB: gadget: g_multi: added documentation and INF files
A short documentation of the g_multi driver along with INF files for Windows XP SP3 are provided.
--- Documentation/usb/gadget_multi.txt | 150 +++++++++++++++++++++++++++++++++++ Documentation/usb/linux-cdc-acm.inf | 4 +- Documentation/usb/linux.inf | 6 +- 3 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 Documentation/usb/gadget_multi.txt
Documentation/usb/gadget_multi.txt new file +150 -0
@@ -0,0 +1,150 @@ + -*- org -*- + +* Overview + +The Multifunction Composite Gadget (or g_multi) is a composite gadget +that makes extensive use of the composite framework to provide +a... multifunction gadget. + +In it's standard configuration it provides a single USB configuration +with RNDIS[1] (that is Ethernet), USB CDC[2] ACM (that is serial) and +USB Mass Storage functions. + +A CDC ECM (Ethernet) function may be turned on via a Kconfig option +and RNDIS can be turned off. If they are both enabled the gadget will +have two configurations -- one with RNDIS and another with CDC ECM[3]. + +Please not that if you use non-standard configuration (that is enable +CDC ECM) you may need to change vendor and/or product ID. + +* Host drivers + +To make use of the gadget one needs to make it work on host side -- +without that there's no hope of achieving anything with the gadget. +As one might expect, things one need to do very from system to system. + +** Linux host drivers + +Since the gadget uses standard composite framework and appears as such +to Linux host it does not need any additional drivers on Linux host +side. All the functions are handled by respective drivers developed +for them. + +This is also true for two configuration set-up with RNDIS +configuration being the first one. Linux host will use the second +configuration with CDC ECM which should work better under Linux. + +** Windows host drivers + +For the gadget two work under Windown two conditions have to be met: + +*** Detecting as composite gadget + +First of all, Windows need to detect the gadget as an USB composite +gadget which on its own have some conditions[4]. If they are met, +Windows lets USB Generic Parent Driver[5] handle the device which then +tries to much drivers for each individual interface (sort of, don't +get into too many details). + +The good news is: you do not have to worry about most of the +conditions! + +The only thing to worry is that the gadget has to have a single +configuration so a dual RNDIS and CDC ECM gadget won't work unless you +create a proper INF -- and of course, if you do submit it! + +*** Installing drivers for each function + +The other, trickier thing is making Windows install drivers for each +individual function. + +For mass storage it is trivial since Windows detect it's an interface +implementing USB Mass Storage class and selects appropriate driver. + +Things are harder with RDNIS and CDC ACM. + +**** RNDIS + +To make Windows select RNDIS drivers for the first function in the +gadget, one needs to use the [[file:linux.inf]] file provided with this +document. It "attaches" Window's RNDIS driver to the first interface +of the gadget. + +Please note, that while testing we encountered some issues[6] when +RNDIS was not the first interface. You do not need to worry abut it +unless you are trying to develop your own gadget in which case watch +out for this bug. + +**** CDC ACM + +Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM. + +**** Customising the gadget + +If you intend to hack the g_multi gadget be advised that rearranging +functions will obviously change interface numbers for each of the +functionality. As an effect provided INFs won't work since they have +interface numbers hard-coded in them (it's not hard to change those +though[7]). + +This also means, that after experimenting with g_multi and changing +provided functions one should change gadget's vendor and/or product ID +so there will be no collision with other customised gadgets or the +original gadget. + +Failing to comply may cause brain damage after wondering for hours why +things don't work as intended before realising Windows have cached +some drivers information (changing USB port may sometimes help plus +you might try using USBDeview[8] to remove the phantom device). + +**** INF testing + +Provided INF files have been tested on Windows XP SP3, Windows Vista +and Windows 7, all 32-bit versions. It should work on 64-bit versions +as well. It most likesy won't work on Windows prior to Windows XP +SP2. + +** Other systems + +At this moment, drivers for any other systems have not been tested. +Knowing how MacOS is based on BSD and BSD is an Open Source it is +believed that it should (read: "I have no idea whether it will") work +out-of-the-box. + +For more exotic systems I have even less to say... + +Any testing and drivers *are* *welcome*! + +* Authors + +This document has been written by Michal Nazarewicz +([[mailto:[email protected]]]). INF files have been hacked with +support of Marek Szyprowski ([[mailto:[email protected]]]) and +Xiaofan Chen ([[mailto:[email protected]]]) basing on the MS RNDIS +template[9], Microchip's CDC ACM INF file and David Brownell's +([[mailto:[email protected]]]) original INF files. + +* Footnotes + +[1] Remote Network Driver Interface Specification, +[[http://msdn.microsoft.com/en-us/library/ee484414.aspx]]. + +[2] Communications Device Class Abstract Control Model, spec for this +and other USB classes can be found at +[[http://www.usb.org/developers/devclass_docs/]]. + +[3] CDC Ethernet Control Model. + +[4] [[http://msdn.microsoft.com/en-us/library/ff537109(v=VS.85).aspx]] + +[5] [[http://msdn.microsoft.com/en-us/library/ff539234(v=VS.85).aspx]] + +[6] To put it in some other nice words, Windows failed to respond to +any user input. + +[7] You may find [[http://www.cygnal.org/ubb/Forum9/HTML/001050.html]] +useful. + +[8] http://www.nirsoft.net/utils/usb_devices_view.html + +[9] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]]
Documentation/usb/linux-cdc-acm.inf +2 -2
@@ -90,10 +90,10 @@ end of the line. [SourceDisksFiles] [SourceDisksNames] [DeviceList] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 [DeviceList.NTamd64] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 ;------------------------------------------------------------------------------
Documentation/usb/linux.inf +3 -3
@@ -19,15 +19,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 ; Decoration for x86 architecture [RndisDevices.NTx86] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for x64 architecture [RndisDevices.NTamd64] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for ia64 architecture [RndisDevices.NTia64] -%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ;@@@ This is the common setting for setup [ControlFlags]
Signature · 1 line
1.7.1
PATCH v5 10/11 USB: gadget: composite: addad disconnect callback
Added a disconnect() callback to compasite devices which is called by composite glue when its disconnect callback is called by gadget.
--- drivers/usb/gadget/composite.c | 2 ++ include/linux/usb/composite.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
drivers/usb/gadget/composite.c +2 -0
@@ -956,6 +956,8 @@ static void composite_disconnect(struct usb_gadget *gadget)spin_lock_irqsave (&cdev->lock, flags);if (cdev->config)reset_config (cdev); +if (composite->disconnect) + composite->disconnect (cdev);spin_unlock_irqrestore (&cdev->lock, flags); }
include/linux/usb/composite.h +2 -0
@@ -276,6 +276,8 @@ struct usb_composite_driver {int (*bind)(struct usb_composite_dev *);int (*unbind)(struct usb_composite_dev *); +void (*disconnect)(struct usb_composite_dev *); +/* global suspend hooks */ void (*suspend)(struct usb_composite_dev *);void (*resume)(struct usb_composite_dev *);
Signature · 1 line
1.7.1
PATCH v5 11/11 USB: gadget: f_mass_storage: added eject callback
Added pre_eject() and post_eject() callbacks which are called befor and after removable logical unit is ejected. The first can prevent logical unit from being ejected.
This commit also changes the way callbacks are passed to the function from gadget. A fsg_operations structure has been created which lists all callbacks -- this is passed to the fsg_config.
This is important because it changes the way thread_exits() callback is passed.
--- drivers/usb/gadget/f_mass_storage.c | 109 ++++++++++++++++++++++------------ drivers/usb/gadget/mass_storage.c | 5 +- 2 files changed, 74 insertions(+), 40 deletions(-)
drivers/usb/gadget/f_mass_storage.c +70 -39
@@ -316,6 +316,27 @@ static const char fsg_string_interface[] = "Mass Storage";/*-------------------------------------------------------------------------*/ struct fsg_dev ; +struct fsg_common ; + +/* FSF callback functions */ +struct fsg_operations { +/* Callback function to call when thread exits. If no +* callback is set or it returns value lower then zero MSF +* will force eject all LUNs it operates on (including those +* marked as non-removable or with prevent_medium_removal flag +* set). */ +int (*thread_exits)(struct fsg_common *common); + +/* Called prior to ejection. Negative return means error, +* zero means to continue with ejection, positive means not to +* eject. */ +int (*pre_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +/* Called after ejection. Negative return means error, zero +* or positive is just a success. */ +int (*post_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +};/* Data shared by all the FSG instances. */
@@ -370,8 +391,8 @@ struct fsg_common {struct completion thread_notifier;struct task_struct *thread_task; -/* Callback function to call when thread exits. */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -395,12 +416,8 @@ struct fsg_config {const char *lun_name_format;const char *thread_name; -/* Callback function to call when thread exits. If no -* callback is set or it returns value lower then zero MSF -* will force eject all LUNs it operates on (including those -* marked as non-removable or with prevent_medium_removal flag -* set). */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -436,6 +453,7 @@ static inline int __fsg_is_set(struct fsg_common *common,if (common->fsg)return 1 ;ERROR (common,"common->fsg is NULL in %s at %u\n" , func, line); +WARN_ON (1 );return 0 ; }
@@ -1396,43 +1414,55 @@ static int do_start_stop(struct fsg_common *common) }else if (!curlun->removable) { curlun->sense_data =SS_INVALID_COMMAND ;return -EINVAL ; - } - - loej = common->cmnd[4 ] &0x02 ; - start = common->cmnd[4 ] &0x01 ; - -/* eject code from file_storage.c:do_start_stop() */ - -if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ - (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ + }else if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ + (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; } -if (!start) { -/* Are we allowed to unload the media? */ -if (curlun->prevent_medium_removal) { -LDBG (curlun,"unload attempt prevented\n" ); - curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; -return -EINVAL ; - } -if (loej) {/* Simulate an unload/eject */ -up_read (&common->filesem); -down_write (&common->filesem); -fsg_lun_close (curlun); -up_write (&common->filesem); -down_read (&common->filesem); - } - }else { + loej = common->cmnd[4 ] &0x02 ; + start = common->cmnd[4 ] &0x01 ; -/* Our emulation doesn't support mounting; the medium is -* available for use as soon as it is loaded. */ +/* Our emulation doesn't support mounting; the medium is +* available for use as soon as it is loaded. */ +if (start) {if (!fsg_lun_is_open (curlun)) { curlun->sense_data =SS_MEDIUM_NOT_PRESENT ;return -EINVAL ; } +return 0 ; } -return 0 ; + +/* Are we allowed to unload the media? */ +if (curlun->prevent_medium_removal) { +LDBG (curlun,"unload attempt prevented\n" ); + curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; +return -EINVAL ; + } + +if (!loej) +return 0 ; + +/* Simulate an unload/eject */ +if (common->ops && common->ops->pre_eject) { +int r = common->ops->pre_eject (common, curlun, + curlun - common->luns); +if (unlikely (r <0 )) +return r; +else if (r) +return 0 ; + } + +up_read (&common->filesem); +down_write (&common->filesem); +fsg_lun_close (curlun); +up_write (&common->filesem); +down_read (&common->filesem); + +return common->ops && common->ops->post_eject + ?min (0 , common->ops->post_eject (common, curlun, + curlun - common->luns)) + :0 ; }
@@ -2657,7 +2687,8 @@ static int fsg_main_thread(void *common_) common->thread_task =NULL ;spin_unlock_irq (&common->lock); -if (!common->thread_exits || common->thread_exits (common) <0 ) { +if (!common->ops || !common->ops->thread_exits + || common->ops->thread_exits (common) <0 ) {struct fsg_lun *curlun = common->luns;unsigned i = common->nluns;
@@ -2733,6 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, common->free_storage_on_release =0 ; } + common->ops = cfg->ops; common->private_data = cfg->private_data; common->gadget = gadget;
@@ -2854,7 +2886,6 @@ buffhds_first_it:/* Tell the thread to start working */ - common->thread_exits = cfg->thread_exits; common->thread_task =kthread_create (fsg_main_thread, common,OR (cfg->thread_name,"file-storage" ));
@@ -3151,8 +3182,8 @@ fsg_config_from_params(struct fsg_config *cfg, cfg->product_name =0 ; cfg->release =0xffff ; - cfg->thread_exits =0 ; - cfg->private_data =0 ; + cfg->ops =NULL ; + cfg->private_data =NULL ;/* Finalise */ cfg->can_stall = params->stall;
drivers/usb/gadget/mass_storage.c +4 -1
@@ -143,6 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { +static const struct fsg_operations ops = { + .thread_exits = msg_thread_exits, + };static struct fsg_common common;struct fsg_common *retp;
@@ -155,7 +158,7 @@ static int __init msg_do_config(struct usb_configuration *c) }fsg_config_from_params (&config, &mod_data); - config.thread_exits = msg_thread_exits; + config.ops = &ops; retp =fsg_common_init (&common, c->cdev, &config);if (IS_ERR (retp))
Signature · 1 line
1.7.1
Re: [PATCHv5 10/11] USB: gadget: composite: addad disconnect callback
In reply to Michal NazarewiczHello.
Quoted 1 line · Michal Nazarewicz
Added a
disconnect()callback to compasite devices which
Your subject has "addad" -- probably instead of "added".
Quoted 6 lines
is called by composite glue when its disconnect callback is called by gadget.
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Acked-by David Brownell <[email protected]>
WBR, Sergei
Re: [PATCHv5 10/11] USB: gadget: composite: addad disconnect callback
Hello.
Quoted 5 lines · I wrote:
Quoted 1 line · Michal Nazarewicz
Added a
disconnect()callback to compasite devices whichYour subject has "addad" -- probably instead of "added".
Also, there's typo in the first line: "compasite"...
Quoted 6 lines
Quoted 6 lines
is called by composite glue when its disconnect callback is called by gadget.
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Acked-by David Brownell <[email protected]>
WBR, Sergei
Re: [PATCHv5 08/11] USB: gadget: g_serial: INF file updated
In reply to Michal NazarewiczAck is inlined below.
Quoted 11 lines · Michal Nazarewicz
From: Michal Nazarewicz <[email protected]>
Subject: [PATCHv5 08/11] USB: gadget:g_serial: INF file updated
To: [email protected]
Cc: "David Brownell" <[email protected]>, "Greg KH" <[email protected]>, "Xiaofan Chen" <[email protected]>, "Kyungmin Park" <[email protected]>, "Marek Szyprowski" <[email protected]>, [email protected]
Date: Wednesday, June 16, 2010, 3:08 AM
Updated the INF file forg_serial
gadget. It should work with
most recent Windows systems now.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Quoted 284 lines
--- Documentation/usb/gadget_serial.txt | 87 +++------------------------- Documentation/usb/linux-cdc-acm.inf | 107 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 77 deletions(-) create mode 100644 Documentation/usb/linux-cdc-acm.infDocumentation/usb/gadget_serial.txt +0
-0@@ -151,88 +151,23 @@ instructions below to install thehost side driver.
Installing the Windows Host ACM Driver
--------------------------------------
-To use the Windows ACM driver you must have the files "gserial.inf"
-and "usbser.sys" together in a folder on the Windows machine.Documentation/usb/gadget_serial.txt +0
-39- -The "gserial.inf" file is given here. - --------------------- CUT HERE -------------------- -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%LINUX% -DriverVer=08/17/2004,0.0.2.0 -; Copyright (C) 2004 Al Borchers ([email protected]) - -[Manufacturer] -%LINUX%=GSerialDeviceList - -[GSerialDeviceList] -%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7 - -[DestinationDirs] -DefaultDestDir=10,System32\Drivers - -[GSerialInstall] -CopyFiles=GSerialCopyFiles -AddReg=GSerialAddReg - -[GSerialCopyFiles] -usbser.sys - -[GSerialAddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[GSerialInstall.Services] -AddService = usbser,0x0002,GSerialService - -[GSerialService] -DisplayName = %GSERIAL_DISPLAY_NAME% -ServiceType = 1;
SERVICE_KERNEL_DRIVER
-StartType = 3
;SERVICE_DEMAND_START
-ErrorControl = 1
;SERVICE_ERROR_NORMALDocumentation/usb/gadget_serial.txt +0
-10-ServiceBinary = %10%\System32\Drivers\usbser.sys -LoadOrderGroup = Base - -[Strings] -LINUX = "Linux" -GSERIAL = "Gadget Serial" -GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver" --------------------- CUT HERE -------------------- - -The "usbser.sys" file comes with various versions ofWindows.
Documentation/usb/gadget_serial.txt +0
-5-For example, it can be found on Windows XP typically in - - C:\WINDOWS\Driver Cache\i386\driver.cab - -Or it can be found on the Windows 98SE CD in the "win98"folder
-in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files. You will
-need the DOS "expand" program, the Cygwin "cabextract" program, or
-a similar program to unpack these cab files and extract "usbser.sys".Documentation/usb/gadget_serial.txt +0
-2- -For example, to extract "usbser.sys" into the currentdirectory
Documentation/usb/gadget_serial.txt +0
-6-on Windows XP, open a DOS window and run a command like - - expand C:\WINDOWS\Driver~1\i386\driver.cab -F:usbser.sys . - -(Thanks to Nishant Kamat for pointing out this DOScommand.)
+To use the Windows ACM driver you must have the "linux-cdc-acm.inf"
+file (provided along this document) which supports all recent versions
+of Windows.When the gadget serial driver is loaded and the USB device
connected
to the Windows host with a USB cable, Windows should
recognize the
gadget serial device and ask for a driver. Tell
Windows to find the
-driver in the folder that contains "gserial.inf" and "usbser.sys".
+driver in the folder that contains the "linux-cdc-acm.inf" file.For example, on Windows XP, when the gadget serial device
is first
plugged in, the "Found New Hardware Wizard" starts
up. Select
-"Install from a list or specific location (Advanced)", then on
-the next screen select "Include this location in the search" and
-enter the path or browse to the folder containing "gserial.inf" and
-"usbser.sys". Windows will complain that the Gadget Serial driver
-has not passed Windows Logo testing, but select "Continue anyway"
-and finish the driver installation.
+"Install from a list or specific location (Advanced)", then on the
+next screen select "Include this location in the search" and enter the
+path or browse to the folder containing the "linux-cdc-acm.inf" file.
+Windows will complain that the Gadget Serial driver has not passed
+Windows Logo testing, but select "Continue anyway" and finish the
+driver installation.On Windows XP, in the "Device Manager" (under "Control
Panel",
"System", "Hardware") expand the "Ports (COM & LPT)"
entry and youDocumentation/usb/gadget_serial.txt +0
-0@@ -345,5 +280,3 @@ you should be able to send data backand forth between the gadget
side and host side systems. Anything you type on the
terminal
window on the gadget side should appear in the terminal
window on
the host side and vice versa.Documentation/usb/gadget_serial.txt +0
-2- -Documentation/usb/linux-cdc-acm.inf new file +4
-0@@ -0,0 +1,107 @@ +; Windows USB CDC ACM Setup File + +; Based on INF temlate which was: +; Copyright (c) 2000 MicrosoftCorporation
+; Copyright (c) 2007 Microchip
Technology Inc.Documentation/usb/linux-cdc-acm.inf new file +77
-0+; likely to be cevered by the MLPL as found at: +; <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. +; For use only on Windows operating systems. + +[Version] +Signature="$Windows NT$" +Class=Ports +ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} +Provider=%Linux% +DriverVer=11/15/2007,5.1.2600.0 + +[Manufacturer] +%Linux%=DeviceList, NTamd64 + +[DestinationDirs] +DefaultDestDir=12 + + +;------------------------------------------------------------------------------ +; Windows 2000/XP/Vista-32bit Sections +;------------------------------------------------------------------------------ + +[DriverInstall.nt] +include=mdmcpq.inf +CopyFiles=DriverCopyFiles.nt +AddReg=DriverInstall.nt.AddReg + +[DriverCopyFiles.nt] +usbser.sys,,,0x20 + +[DriverInstall.nt.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,USBSER.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.nt.Services] +AddService=usbser, 0x00000002, DriverService.nt + +[DriverService.nt] +DisplayName=%SERVICE% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\USBSER.sys + +;------------------------------------------------------------------------------ +; Vista-64bit Sections +;------------------------------------------------------------------------------ + +[DriverInstall.NTamd64] +include=mdmcpq.inf +CopyFiles=DriverCopyFiles.NTamd64 +AddReg=DriverInstall.NTamd64.AddReg + +[DriverCopyFiles.NTamd64] +USBSER.sys,,,0x20 + +[DriverInstall.NTamd64.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,USBSER.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.NTamd64.Services] +AddService=usbser, 0x00000002, DriverService.NTamd64 + +[DriverService.NTamd64] +DisplayName=%SERVICE% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\USBSER.sys + + +;------------------------------------------------------------------------------ +; Vendor and Product ID Definitions +;------------------------------------------------------------------------------ +; When developing your USB device, the VID and PID used inthe PC side
+; application program and the firmware on the microcontroller must match.
+; Modify the below line to use your VID and PID. Use the format as shown below.
+; Note: One INF file can be used for multiple devices with differentDocumentation/usb/linux-cdc-acm.inf new file +2
-0+VID and PIDs. +; For each supported device, append",USB\VID_xxxx&PID_yyyy" to the
Documentation/usb/linux-cdc-acm.inf new file +18
-0+end of the line. +;------------------------------------------------------------------------------ +[SourceDisksFiles] +[SourceDisksNames] +[DeviceList] +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 + +[DeviceList.NTamd64] +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 + + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ +;Modify these strings to customize your device +;------------------------------------------------------------------------------ +[Strings] +Linux= "Linux Developer Community"
+DESCRIPTION =
"Gadget Serial"
+SERVICE
= "USB RS-232 Emulation Driver"Signature · 1 line
1.7.1
Re: [PATCHv5 07/11] USB: gadget: g_ether: updated INF file
In reply to Michal NazarewiczQuoted 6 lines
Updated the INF file for the
g_ether
gadegt. It should work with most
recent Windows systems now. The file hase been also renamed to
linux-rndis.inf rather then linux.inf.
NAK ... still waiting for a version of the patch with all requested changes. In particular, without the rename (which invalidates most documentation, though it would otherwise be a reasonable cleanup).
PATCH v5 7/11 USB: gadget: g_ether: updated INF file
Updated the INF file for the g_ether gadegt. It should work with most recent Windows systems now.
---
Quoted 5 lines · David Brownell
NAK ... still waiting for a version of the patch with all requested changes. In particular, without the rename (which invalidates most documentation, though it would otherwise be a reasonable cleanup).
Argh... Sorry about that. The patch was updated per your suggestion. I only forgot about the commit message...
As such, this is identical to the previous expect the last sentence of the commit is removed.
Documentation/usb/linux.inf | 236 ++++++++++--------------------------------- 1 files changed, 52 insertions(+), 184 deletions(-)
Documentation/usb/linux.inf +52 -184
@@ -1,200 +1,68 @@ -; MS-Windows driver config matching some basic modes of the -; Linux-USB Ethernet/RNDIS gadget firmware: -; -; - RNDIS plus CDC Ethernet ... this may be familiar as a DOCSIS -; cable modem profile, and supports most non-Microsoft USB hosts -; -; - RNDIS plus CDC Subset ... used by hardware that incapable of -; full CDC Ethernet support. -; -; Microsoft only directly supports RNDIS drivers, and bundled them into XP. -; The Microsoft "Remote NDIS USB Driver Kit" is currently found at: -; http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx - +; Based on template INF file found at +; <http://msdn.microsoft.com/en-us/library/ff570620.aspx> +; which was: +; Copyright (c) Microsoft Corporation +; and released under the MLPL as found at: +; <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. +; For use only on Windows operating systems. [Version] -Signature = "$CHICAGO$" +Signature = "$Windows NT$" Class = Net ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} Provider = %Linux% -Compatible = 1 -MillenniumPreferred = .ME -DriverVer = 03/30/2004,0.0.0.0 -; catalog file would be used by WHQL -;CatalogFile = Linux.cat +DriverVer = 06/21/2006,6.0.6000.16384 +;CatalogFile = device.cat [Manufacturer] -%Linux% = LinuxDevices,NT.5.1 +%Linux% = RndisDevices,NTx86,NTamd64,NTia64 + +; Decoration for x86 architecture +[RndisDevices.NTx86] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices] -; NetChip IDs, used by both firmware modes -%LinuxDevice% = RNDIS, USB\VID_0525&PID_a4a2 +; Decoration for x64 architecture +[RndisDevices.NTamd64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices.NT.5.1] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +; Decoration for ia64 architecture +[RndisDevices.NTia64] +%RndisDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; Windows 98, Windows 98 Second Edition specific sections -------- - -[RNDIS] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_98, RNDIS_AddReg_Common - -[RNDIS_AddReg_98] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_98" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_98] -CopyFiles=RNDIS_CopyFiles_98 - -[RNDIS_CopyFiles_98] -usb8023.sys, usb8023w.sys, , 0 -rndismp.sys, rndismpw.sys, , 0 - -; Windows Millennium Edition specific sections -------------------- - -[RNDIS.ME] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_ME, RNDIS_AddReg_Common -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 - -[RNDIS_AddReg_ME] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_ME" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_ME] -CopyFiles=RNDIS_CopyFiles_ME - -[RNDIS_CopyFiles_ME] -usb8023.sys, usb8023m.sys, , 0 -rndismp.sys, rndismpm.sys, , 0 - -; Windows 2000 specific sections --------------------------------- - -[RNDIS.NT] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -CopyFiles = RNDIS_CopyFiles_NT - -[RNDIS.NT.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_NT, RNDIS_EventLog - -[RNDIS_CopyFiles_NT] -; no rename of files on Windows 2000, use the 'k' names as is -usb8023k.sys, , , 0 -rndismpk.sys, , , 0 - -[RNDIS_ServiceInst_NT] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023k.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_NT - -[RNDIS_WMI_AddReg_NT] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismpk.sys" - -; Windows XP specific sections ----------------------------------- - +; DDInstall section +; References the in-build Netrndis.inf [RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -; no copyfiles - the files are already in place - +Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType = 15 +; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF +include = netrndis.inf +needs = Usb_Rndis.ndi +AddReg = Rndis_AddReg_Vista + +; DDInstal.Services section [RNDIS.NT.5.1.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_51, RNDIS_EventLog - -[RNDIS_ServiceInst_51] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_51 - -[RNDIS_WMI_AddReg_51] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismp.sys" - -; Windows 2000 and Windows XP common sections -------------------- - -[RNDIS_AddReg_NT] -HKR, Ndi, Service, 0, "USB_RNDIS" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" - -[RNDIS_EventLog] -AddReg = RNDIS_EventLog_AddReg - -[RNDIS_EventLog_AddReg] -HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll" -HKR, , TypesSupported, 0x00010001, 7 - -; Common Sections ------------------------------------------------- - -[RNDIS_AddReg_Common] -HKR, NDI\params\NetworkAddress, ParamDesc, 0, %NetworkAddress% -HKR, NDI\params\NetworkAddress, type, 0, "edit" -HKR, NDI\params\NetworkAddress, LimitText, 0, "12" -HKR, NDI\params\NetworkAddress, UpperCase, 0, "1" -HKR, NDI\params\NetworkAddress, default, 0, " " -HKR, NDI\params\NetworkAddress, optional, 0, "1" - -[SourceDisksNames] -1=%SourceDisk%,,1 - -[SourceDisksFiles] -usb8023m.sys=1 -rndismpm.sys=1 -usb8023w.sys=1 -rndismpw.sys=1 -usb8023k.sys=1 -rndismpk.sys=1 - -[DestinationDirs] -RNDIS_CopyFiles_98 = 10, system32/drivers -RNDIS_CopyFiles_ME = 10, system32/drivers -RNDIS_CopyFiles_NT = 12 - +include = netrndis.inf +needs = Usb_Rndis.ndi.Services + +; Optional registry settings. You can modify as needed. +[RNDIS_AddReg_Vista] +HKR, NDI\params\VistaProperty, ParamDesc, 0, %Vista_Property% +HKR, NDI\params\VistaProperty, type, 0, "edit" +HKR, NDI\params\VistaProperty, LimitText, 0, "12" +HKR, NDI\params\VistaProperty, UpperCase, 0, "1" +HKR, NDI\params\VistaProperty, default, 0, " " +HKR, NDI\params\VistaProperty, optional, 0, "1" + +; No sys copyfiles - the sys files are already in-build +; (part of the operating system). +; We do not support XP SP1-, 2003 SP1-, ME, 9x. + +; Modify these strings for your device as needed. [Strings] -ServiceDisplayName = "USB Remote NDIS Network Device Driver" -NetworkAddress = "Network Address" -Linux = "Linux Developer Community" -LinuxDevice = "Linux USB Ethernet/RNDIS Gadget" -SourceDisk = "Ethernet/RNDIS Gadget Driver Install Disk" - +Linux = "Linux Developer Community" +RndisDevice = "Ethernet/RNDIS Gadget" +Vista_Property = "Optional Vista Property"
Signature · 1 line
1.7.1
Re: [PATCHv5 06/11] USB: gadget: g_multi: code clean up and refactoring
In reply to Michal NazarewiczQuoted 16 lines · Michal Nazarewicz
The Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/multi.c | 262 +++++++++++++++++++++++++------------------- 2 files changed, 148 insertions(+), 115 deletions(-)drivers/usb/gadget/Kconfig +0
-0
drivers/usb/gadget/Kconfig config USB_G_NOKIA · line 869
Quoted 7 lines
drivers/usb/gadget/Kconfig +1
-0@@ -863,6 +863,7 @@ config USB_G_NOKIA config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NET + select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial link
Why is this change needed? Did you do something else in this patch that requires it?
confused,
greg k-h
Re: [PATCHv5 06/11] USB: gadget: g_multi: code clean up and refactoring
Quoted 12 lines · Greg KH
Quoted 11 lines · Michal Nazarewicz
The Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/multi.c | 262 +++++++++++++++++++++++++------------------- 2 files changed, 148 insertions(+), 115 deletions(-)
Quoted 15 lines
drivers/usb/gadget/Kconfig config USB_G_NOKIA · line 869
Quoted 12 lines
drivers/usb/gadget/Kconfig +1
-0@@ -863,6 +863,7 @@ config USB_G_NOKIA config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NET + select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial linkWhy is this change needed? Did you do something else in this patch that requires it?
Without this select it is possible to choose neither RNDIS nor CDC ECM which in turns builds a module with no configurations.
I've also realised recently that one does not need to specify bNumConfigurations in usb_device_descriptor since composite counts that for us so I'll resend this patch with that fixed as well.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
Re: [PATCHv5 06/11] USB: gadget: g_multi: code clean up and refactoring
Quoted 30 lines · Michał Nazarewicz
Quoted 12 lines · Greg KH
Quoted 11 lines · Michal Nazarewicz
The Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
drivers/usb/gadget/Kconfig| 1 +drivers/usb/gadget/multi.c| 262 +++++++++++++++++++++++++-------------------2 files changed, 148 insertions(+), 115 deletions(-)Quoted 15 lines
Quoted 9 lines
drivers/usb/gadget/Kconfig +0
-0@@ -863,6 +863,7 @@ config USB_G_NOKIAconfig
USB_G_MULTItristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NETdrivers/usb/gadget/Kconfig +1
-0+ select USB_G_MULTI_CDC if !USB_G_MULTI_RNDISQuoted 3 lines
help
The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial linkWhy is this change needed? Did you do something else in this patch that requires it?
Quoted 2 lines
Without this select it is possible to choose neither RNDIS nor CDC ECM which in turns builds a module with no configurations.
Then you need to say that in the changelog portion of the patch submission :)
thanks,
greg k-h
Re: [PATCHv5 00/11] g_multi & other improvements and cleanpus
In reply to Michal NazarewiczQuoted 18 lines · Michal Nazarewicz
Quoted 2 lines · Greg KH
Can you resend this the 5th time so I know I have all of the proper versions?
As requested resending the whole patchset again.
Compared to the previous comments in RNDIS and CDC ACM INF files have been updated (the RNDIS fix was previously sent as v4.1 but this patchset includes a bit updated version) and a little fix to patch 01 has been applied (already sent as version v4.1).
The
g_multi"more configuration" and install mode has been exluded from this patches -- they weren't ment for inclusien in the kernel in th elast patchset (just to show them), so no point in including here (if aynone interested refer to v4 patches 10/13 and 13/13).
Quoted 4 lines
I wasn't sure 100% sure what wording to use in the CDC ACM INF file so I put something that is likely to be true and safe. ;) I posted on m.p.d.d.d and contactec Microchip so maybe there will be some more info.
I've applied the first 5 patches, as I had a question about the 6th one, and David doesn't seem happy with the 7th.
Care to resolve those issues and just resend the remaining?
thanks,
greg k-h
Re: [PATCHv5 00/11] g_multi & other improvements and cleanpus
Quoted 19 lines · Greg KH
Quoted 18 lines · Michal Nazarewicz
Quoted 2 lines · Greg KH
Can you resend this the 5th time so I know I have all of the proper versions?
As requested resending the whole patchset again.
Compared to the previous comments in RNDIS and CDC ACM INF files have been updated (the RNDIS fix was previously sent as v4.1 but this patchset includes a bit updated version) and a little fix to patch 01 has been applied (already sent as version v4.1).
The
g_multi"more configuration" and install mode has been exluded from this patches -- they weren't ment for inclusien in the kernel in th elast patchset (just to show them), so no point in including here (if aynone interested refer to v4 patches 10/13 and 13/13).
Quoted 7 lines
Quoted 4 lines
I wasn't sure 100% sure what wording to use in the CDC ACM INF file so I put something that is likely to be true and safe. ;) I posted on m.p.d.d.d and contactec Microchip so maybe there will be some more info.
I've applied the first 5 patches, as I had a question about the 6th one, and David doesn't seem happy with the 7th.
Thanks!
Quoted 1 line
Care to resolve those issues and just resend the remaining?
The issue with 6th was just a mistake in commit message. I resubmitted corrected patch (marked as v5.1) which David should (I hope) find no problems with.
As requested I'll resend patches from 6 to 11 in a second.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
A message that is not in the archive (sent off-list or not yet received): 2809a031d19ac6ef793d7fe343e225b8d80099c3.1276864406.git.m.nazarewicz@samsung.com
PATCH v6 7/11 USB: gadget: g_ether: updated INF file
Updated the INF file for the g_ether gadegt. It should work with most recent Windows systems now.
--- Documentation/usb/linux.inf | 228 +++++++++---------------------------------- 1 files changed, 47 insertions(+), 181 deletions(-)
Documentation/usb/linux.inf +47 -181
@@ -1,200 +1,66 @@ -; MS-Windows driver config matching some basic modes of the -; Linux-USB Ethernet/RNDIS gadget firmware: -; -; - RNDIS plus CDC Ethernet ... this may be familiar as a DOCSIS -; cable modem profile, and supports most non-Microsoft USB hosts -; -; - RNDIS plus CDC Subset ... used by hardware that incapable of -; full CDC Ethernet support. -; -; Microsoft only directly supports RNDIS drivers, and bundled them into XP. -; The Microsoft "Remote NDIS USB Driver Kit" is currently found at: -; http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx - +; Based on template INF file found at +; <http://msdn.microsoft.com/en-us/library/ff570620.aspx> +; which was: +; Copyright (c) Microsoft Corporation +; and released under the MLPL as found at: +; <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>. +; For use only on Windows operating systems. [Version] -Signature = "$CHICAGO$" +Signature = "$Windows NT$" Class = Net ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} Provider = %Linux% -Compatible = 1 -MillenniumPreferred = .ME -DriverVer = 03/30/2004,0.0.0.0 -; catalog file would be used by WHQL -;CatalogFile = Linux.cat +DriverVer = 06/21/2006,6.0.6000.16384 [Manufacturer] -%Linux% = LinuxDevices,NT.5.1 +%Linux% = LinuxDevices,NTx86,NTamd64,NTia64 + +; Decoration for x86 architecture +[LinuxDevices.NTx86] +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices] -; NetChip IDs, used by both firmware modes -%LinuxDevice% = RNDIS, USB\VID_0525&PID_a4a2 +; Decoration for x64 architecture +[LinuxDevices.NTamd64] +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 -[LinuxDevices.NT.5.1] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +; Decoration for ia64 architecture +[LinuxDevices.NTia64] +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +;@@@ This is the common setting for setup [ControlFlags] ExcludeFromSelect=* -; Windows 98, Windows 98 Second Edition specific sections -------- - -[RNDIS] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_98, RNDIS_AddReg_Common - -[RNDIS_AddReg_98] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_98" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_98" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_98] -CopyFiles=RNDIS_CopyFiles_98 - -[RNDIS_CopyFiles_98] -usb8023.sys, usb8023w.sys, , 0 -rndismp.sys, rndismpw.sys, , 0 - -; Windows Millennium Edition specific sections -------------------- - -[RNDIS.ME] -DeviceID = usb8023 -MaxInstance = 512 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_ME, RNDIS_AddReg_Common -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 - -[RNDIS_AddReg_ME] -HKR, , DevLoader, 0, *ndis -HKR, , DeviceVxDs, 0, usb8023.sys -HKR, NDIS, LogDriverName, 0, "usb8023" -HKR, NDIS, MajorNdisVersion, 1, 5 -HKR, NDIS, MinorNdisVersion, 1, 0 -HKR, Ndi\Interfaces, DefUpper, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, DefLower, 0, "ethernet" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis3,ndis4,ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" -HKR, Ndi\Install, ndis3, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis4, 0, "RNDIS_Install_ME" -HKR, Ndi\Install, ndis5, 0, "RNDIS_Install_ME" -HKR, Ndi, DeviceId, 0, "USB\VID_0525&PID_a4a2" - -[RNDIS_Install_ME] -CopyFiles=RNDIS_CopyFiles_ME - -[RNDIS_CopyFiles_ME] -usb8023.sys, usb8023m.sys, , 0 -rndismp.sys, rndismpm.sys, , 0 - -; Windows 2000 specific sections --------------------------------- - -[RNDIS.NT] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -CopyFiles = RNDIS_CopyFiles_NT - -[RNDIS.NT.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_NT, RNDIS_EventLog - -[RNDIS_CopyFiles_NT] -; no rename of files on Windows 2000, use the 'k' names as is -usb8023k.sys, , , 0 -rndismpk.sys, , , 0 - -[RNDIS_ServiceInst_NT] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023k.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_NT - -[RNDIS_WMI_AddReg_NT] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismpk.sys" - -; Windows XP specific sections ----------------------------------- - +; DDInstall section +; References the in-build Netrndis.inf [RNDIS.NT.5.1] -Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI -BusType = 15 -DriverVer = 03/30/2004,0.0.0.0 -AddReg = RNDIS_AddReg_NT, RNDIS_AddReg_Common -; no copyfiles - the files are already in place - +Characteristics = 0x84 ; NCF_PHYSICAL + NCF_HAS_UI +BusType = 15 +; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF +include = netrndis.inf +needs = Usb_Rndis.ndi +AddReg = Rndis_AddReg_Vista + +; DDInstal.Services section [RNDIS.NT.5.1.Services] -AddService = USB_RNDIS, 2, RNDIS_ServiceInst_51, RNDIS_EventLog - -[RNDIS_ServiceInst_51] -DisplayName = %ServiceDisplayName% -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\usb8023.sys -LoadOrderGroup = NDIS -AddReg = RNDIS_WMI_AddReg_51 - -[RNDIS_WMI_AddReg_51] -HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismp.sys" - -; Windows 2000 and Windows XP common sections -------------------- - -[RNDIS_AddReg_NT] -HKR, Ndi, Service, 0, "USB_RNDIS" -HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" -HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" - -[RNDIS_EventLog] -AddReg = RNDIS_EventLog_AddReg - -[RNDIS_EventLog_AddReg] -HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll" -HKR, , TypesSupported, 0x00010001, 7 - -; Common Sections ------------------------------------------------- - -[RNDIS_AddReg_Common] -HKR, NDI\params\NetworkAddress, ParamDesc, 0, %NetworkAddress% -HKR, NDI\params\NetworkAddress, type, 0, "edit" -HKR, NDI\params\NetworkAddress, LimitText, 0, "12" -HKR, NDI\params\NetworkAddress, UpperCase, 0, "1" -HKR, NDI\params\NetworkAddress, default, 0, " " -HKR, NDI\params\NetworkAddress, optional, 0, "1" - -[SourceDisksNames] -1=%SourceDisk%,,1 - -[SourceDisksFiles] -usb8023m.sys=1 -rndismpm.sys=1 -usb8023w.sys=1 -rndismpw.sys=1 -usb8023k.sys=1 -rndismpk.sys=1 - -[DestinationDirs] -RNDIS_CopyFiles_98 = 10, system32/drivers -RNDIS_CopyFiles_ME = 10, system32/drivers -RNDIS_CopyFiles_NT = 12 +include = netrndis.inf +needs = Usb_Rndis.ndi.Services + +; Optional registry settings. You can modify as needed. +[RNDIS_AddReg_Vista] +HKR, NDI\params\VistaProperty, ParamDesc, 0, %Vista_Property% +HKR, NDI\params\VistaProperty, type, 0, "edit" +HKR, NDI\params\VistaProperty, LimitText, 0, "12" +HKR, NDI\params\VistaProperty, UpperCase, 0, "1" +HKR, NDI\params\VistaProperty, default, 0, " " +HKR, NDI\params\VistaProperty, optional, 0, "1" + +; No sys copyfiles - the sys files are already in-build +; (part of the operating system). +; We do not support XP SP1-, 2003 SP1-, ME, 9x. [Strings] -ServiceDisplayName = "USB Remote NDIS Network Device Driver" -NetworkAddress = "Network Address" Linux = "Linux Developer Community" LinuxDevice = "Linux USB Ethernet/RNDIS Gadget" -SourceDisk = "Ethernet/RNDIS Gadget Driver Install Disk" - +Vista_Property = "Optional Vista Property"
Signature · 1 line
1.7.1
PATCH v6 8/11 USB: gadget: g_serial: INF file updated
Updated the INF file for g_serial gadget. It should work with most recent Windows systems now.
--- Documentation/usb/gadget_serial.txt | 87 +++------------------------- Documentation/usb/linux-cdc-acm.inf | 107 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 77 deletions(-) create mode 100644 Documentation/usb/linux-cdc-acm.inf
Documentation/usb/gadget_serial.txt +10 -77
@@ -151,88 +151,23 @@ instructions below to install the host side driver. Installing the Windows Host ACM Driver -------------------------------------- -To use the Windows ACM driver you must have the files "gserial.inf" -and "usbser.sys" together in a folder on the Windows machine. - -The "gserial.inf" file is given here. - --------------------- CUT HERE -------------------- -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%LINUX% -DriverVer=08/17/2004,0.0.2.0 -; Copyright (C) 2004 Al Borchers ([email protected]) - -[Manufacturer] -%LINUX%=GSerialDeviceList - -[GSerialDeviceList] -%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7 - -[DestinationDirs] -DefaultDestDir=10,System32\Drivers - -[GSerialInstall] -CopyFiles=GSerialCopyFiles -AddReg=GSerialAddReg - -[GSerialCopyFiles] -usbser.sys - -[GSerialAddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[GSerialInstall.Services] -AddService = usbser,0x0002,GSerialService - -[GSerialService] -DisplayName = %GSERIAL_DISPLAY_NAME% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %10%\System32\Drivers\usbser.sys -LoadOrderGroup = Base - -[Strings] -LINUX = "Linux" -GSERIAL = "Gadget Serial" -GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver" --------------------- CUT HERE -------------------- - -The "usbser.sys" file comes with various versions of Windows. -For example, it can be found on Windows XP typically in - - C:\WINDOWS\Driver Cache\i386\driver.cab - -Or it can be found on the Windows 98SE CD in the "win98" folder -in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files. You will -need the DOS "expand" program, the Cygwin "cabextract" program, or -a similar program to unpack these cab files and extract "usbser.sys". - -For example, to extract "usbser.sys" into the current directory -on Windows XP, open a DOS window and run a command like - - expand C:\WINDOWS\Driver~1\i386\driver.cab -F:usbser.sys . - -(Thanks to Nishant Kamat for pointing out this DOS command.) +To use the Windows ACM driver you must have the "linux-cdc-acm.inf" +file (provided along this document) which supports all recent versions +of Windows. When the gadget serial driver is loaded and the USB device connected to the Windows host with a USB cable, Windows should recognize the gadget serial device and ask for a driver. Tell Windows to find the -driver in the folder that contains "gserial.inf" and "usbser.sys". +driver in the folder that contains the "linux-cdc-acm.inf" file. For example, on Windows XP, when the gadget serial device is first plugged in, the "Found New Hardware Wizard" starts up. Select -"Install from a list or specific location (Advanced)", then on -the next screen select "Include this location in the search" and -enter the path or browse to the folder containing "gserial.inf" and -"usbser.sys". Windows will complain that the Gadget Serial driver -has not passed Windows Logo testing, but select "Continue anyway" -and finish the driver installation. +"Install from a list or specific location (Advanced)", then on the +next screen select "Include this location in the search" and enter the +path or browse to the folder containing the "linux-cdc-acm.inf" file. +Windows will complain that the Gadget Serial driver has not passed +Windows Logo testing, but select "Continue anyway" and finish the +driver installation. On Windows XP, in the "Device Manager" (under "Control Panel", "System", "Hardware") expand the "Ports (COM & LPT)" entry and you
@@ -345,5 +280,3 @@ you should be able to send data back and forth between the gadget side and host side systems. Anything you type on the terminal window on the gadget side should appear in the terminal window on the host side and vice versa. - -
Documentation/usb/linux-cdc-acm.inf new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v6 9/11 USB: gadget: g_multi: added documentation and INF files
A short documentation of the g_multi driver along with INF files for Windows XP SP3 are provided.
--- Documentation/usb/linux-cdc-acm.inf | 4 ++-- Documentation/usb/linux.inf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
Documentation/usb/linux-cdc-acm.inf +2 -2
@@ -90,10 +90,10 @@ end of the line. [SourceDisksFiles] [SourceDisksNames] [DeviceList] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 [DeviceList.NTamd64] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 ;------------------------------------------------------------------------------
Documentation/usb/linux.inf +3 -3
@@ -18,15 +18,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 ; Decoration for x86 architecture [LinuxDevices.NTx86] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for x64 architecture [LinuxDevices.NTamd64] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for ia64 architecture [LinuxDevices.NTia64] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ;@@@ This is the common setting for setup [ControlFlags]
Signature · 1 line
1.7.1
PATCH v6 10/11 USB: gadget: composite: added disconnect callback
Added a disconnect() callback to compasite devices which is called by composite glue when its disconnect callback is called by gadget.
--- drivers/usb/gadget/composite.c | 2 ++ include/linux/usb/composite.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
drivers/usb/gadget/composite.c +2 -0
@@ -956,6 +956,8 @@ static void composite_disconnect(struct usb_gadget *gadget)spin_lock_irqsave (&cdev->lock, flags);if (cdev->config)reset_config (cdev); +if (composite->disconnect) + composite->disconnect (cdev);spin_unlock_irqrestore (&cdev->lock, flags); }
include/linux/usb/composite.h +2 -0
@@ -276,6 +276,8 @@ struct usb_composite_driver {int (*bind)(struct usb_composite_dev *);int (*unbind)(struct usb_composite_dev *); +void (*disconnect)(struct usb_composite_dev *); +/* global suspend hooks */ void (*suspend)(struct usb_composite_dev *);void (*resume)(struct usb_composite_dev *);
Signature · 1 line
1.7.1
PATCH v6 11/11 USB: gadget: f_mass_storage: added eject callback
Added pre_eject() and post_eject() callbacks which are called befor and after removable logical unit is ejected. The first can prevent logical unit from being ejected.
This commit also changes the way callbacks are passed to the function from gadget. A fsg_operations structure has been created which lists all callbacks -- this is passed to the fsg_config.
This is important because it changes the way thread_exits() callback is passed.
--- drivers/usb/gadget/f_mass_storage.c | 109 ++++++++++++++++++++++------------ drivers/usb/gadget/mass_storage.c | 5 +- 2 files changed, 74 insertions(+), 40 deletions(-)
drivers/usb/gadget/f_mass_storage.c +70 -39
@@ -316,6 +316,27 @@ static const char fsg_string_interface[] = "Mass Storage";/*-------------------------------------------------------------------------*/ struct fsg_dev ; +struct fsg_common ; + +/* FSF callback functions */ +struct fsg_operations { +/* Callback function to call when thread exits. If no +* callback is set or it returns value lower then zero MSF +* will force eject all LUNs it operates on (including those +* marked as non-removable or with prevent_medium_removal flag +* set). */ +int (*thread_exits)(struct fsg_common *common); + +/* Called prior to ejection. Negative return means error, +* zero means to continue with ejection, positive means not to +* eject. */ +int (*pre_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +/* Called after ejection. Negative return means error, zero +* or positive is just a success. */ +int (*post_eject)(struct fsg_common *common, +struct fsg_lun *lun,int num); +};/* Data shared by all the FSG instances. */
@@ -370,8 +391,8 @@ struct fsg_common {struct completion thread_notifier;struct task_struct *thread_task; -/* Callback function to call when thread exits. */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -395,12 +416,8 @@ struct fsg_config {const char *lun_name_format;const char *thread_name; -/* Callback function to call when thread exits. If no -* callback is set or it returns value lower then zero MSF -* will force eject all LUNs it operates on (including those -* marked as non-removable or with prevent_medium_removal flag -* set). */ -int (*thread_exits)(struct fsg_common *common); +/* Callback functions. */ +const struct fsg_operations *ops;/* Gadget's private data. */ void *private_data;
@@ -436,6 +453,7 @@ static inline int __fsg_is_set(struct fsg_common *common,if (common->fsg)return 1 ;ERROR (common,"common->fsg is NULL in %s at %u\n" , func, line); +WARN_ON (1 );return 0 ; }
@@ -1396,43 +1414,55 @@ static int do_start_stop(struct fsg_common *common) }else if (!curlun->removable) { curlun->sense_data =SS_INVALID_COMMAND ;return -EINVAL ; - } - - loej = common->cmnd[4 ] &0x02 ; - start = common->cmnd[4 ] &0x01 ; - -/* eject code from file_storage.c:do_start_stop() */ - -if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ - (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ + }else if ((common->cmnd[1 ] & ~0x01 ) !=0 ||/* Mask away Immed */ + (common->cmnd[4 ] & ~0x03 ) !=0 ) {/* Mask LoEj, Start */ curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; } -if (!start) { -/* Are we allowed to unload the media? */ -if (curlun->prevent_medium_removal) { -LDBG (curlun,"unload attempt prevented\n" ); - curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; -return -EINVAL ; - } -if (loej) {/* Simulate an unload/eject */ -up_read (&common->filesem); -down_write (&common->filesem); -fsg_lun_close (curlun); -up_write (&common->filesem); -down_read (&common->filesem); - } - }else { + loej = common->cmnd[4 ] &0x02 ; + start = common->cmnd[4 ] &0x01 ; -/* Our emulation doesn't support mounting; the medium is -* available for use as soon as it is loaded. */ +/* Our emulation doesn't support mounting; the medium is +* available for use as soon as it is loaded. */ +if (start) {if (!fsg_lun_is_open (curlun)) { curlun->sense_data =SS_MEDIUM_NOT_PRESENT ;return -EINVAL ; } +return 0 ; } -return 0 ; + +/* Are we allowed to unload the media? */ +if (curlun->prevent_medium_removal) { +LDBG (curlun,"unload attempt prevented\n" ); + curlun->sense_data =SS_MEDIUM_REMOVAL_PREVENTED ; +return -EINVAL ; + } + +if (!loej) +return 0 ; + +/* Simulate an unload/eject */ +if (common->ops && common->ops->pre_eject) { +int r = common->ops->pre_eject (common, curlun, + curlun - common->luns); +if (unlikely (r <0 )) +return r; +else if (r) +return 0 ; + } + +up_read (&common->filesem); +down_write (&common->filesem); +fsg_lun_close (curlun); +up_write (&common->filesem); +down_read (&common->filesem); + +return common->ops && common->ops->post_eject + ?min (0 , common->ops->post_eject (common, curlun, + curlun - common->luns)) + :0 ; }
@@ -2657,7 +2687,8 @@ static int fsg_main_thread(void *common_) common->thread_task =NULL ;spin_unlock_irq (&common->lock); -if (!common->thread_exits || common->thread_exits (common) <0 ) { +if (!common->ops || !common->ops->thread_exits + || common->ops->thread_exits (common) <0 ) {struct fsg_lun *curlun = common->luns;unsigned i = common->nluns;
@@ -2733,6 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, common->free_storage_on_release =0 ; } + common->ops = cfg->ops; common->private_data = cfg->private_data; common->gadget = gadget;
@@ -2854,7 +2886,6 @@ buffhds_first_it:/* Tell the thread to start working */ - common->thread_exits = cfg->thread_exits; common->thread_task =kthread_create (fsg_main_thread, common,OR (cfg->thread_name,"file-storage" ));
@@ -3151,8 +3182,8 @@ fsg_config_from_params(struct fsg_config *cfg, cfg->product_name =0 ; cfg->release =0xffff ; - cfg->thread_exits =0 ; - cfg->private_data =0 ; + cfg->ops =NULL ; + cfg->private_data =NULL ;/* Finalise */ cfg->can_stall = params->stall;
drivers/usb/gadget/mass_storage.c +4 -1
@@ -143,6 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)static int __init msg_do_config (struct usb_configuration *c) { +static const struct fsg_operations ops = { + .thread_exits = msg_thread_exits, + };static struct fsg_common common;struct fsg_common *retp;
@@ -155,7 +158,7 @@ static int __init msg_do_config(struct usb_configuration *c) }fsg_config_from_params (&config, &mod_data); - config.thread_exits = msg_thread_exits; + config.ops = &ops; retp =fsg_common_init (&common, c->cdev, &config);if (IS_ERR (retp))
Signature · 1 line
1.7.1
PATCH v5 9/11 USB: gadget: g_multi: added documentation and INF files
In reply to Michal NazarewiczA short documentation of the g_multi driver along with INF files for Windows XP SP3 are provided.
---
Sorry about the previous patch -- it was missing the gadget_multi.txt file. Sending corrected version. Maybe I should start drinking coffee after all...
Documentation/usb/gadget_multi.txt | 150 +++++++++++++++++++++++++++++++++++ Documentation/usb/linux-cdc-acm.inf | 4 +- Documentation/usb/linux.inf | 6 +- 3 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 Documentation/usb/gadget_multi.txt
Documentation/usb/gadget_multi.txt new file +150 -0
@@ -0,0 +1,150 @@ + -*- org -*- + +* Overview + +The Multifunction Composite Gadget (or g_multi) is a composite gadget +that makes extensive use of the composite framework to provide +a... multifunction gadget. + +In it's standard configuration it provides a single USB configuration +with RNDIS[1] (that is Ethernet), USB CDC[2] ACM (that is serial) and +USB Mass Storage functions. + +A CDC ECM (Ethernet) function may be turned on via a Kconfig option +and RNDIS can be turned off. If they are both enabled the gadget will +have two configurations -- one with RNDIS and another with CDC ECM[3]. + +Please not that if you use non-standard configuration (that is enable +CDC ECM) you may need to change vendor and/or product ID. + +* Host drivers + +To make use of the gadget one needs to make it work on host side -- +without that there's no hope of achieving anything with the gadget. +As one might expect, things one need to do very from system to system. + +** Linux host drivers + +Since the gadget uses standard composite framework and appears as such +to Linux host it does not need any additional drivers on Linux host +side. All the functions are handled by respective drivers developed +for them. + +This is also true for two configuration set-up with RNDIS +configuration being the first one. Linux host will use the second +configuration with CDC ECM which should work better under Linux. + +** Windows host drivers + +For the gadget two work under Windown two conditions have to be met: + +*** Detecting as composite gadget + +First of all, Windows need to detect the gadget as an USB composite +gadget which on its own have some conditions[4]. If they are met, +Windows lets USB Generic Parent Driver[5] handle the device which then +tries to much drivers for each individual interface (sort of, don't +get into too many details). + +The good news is: you do not have to worry about most of the +conditions! + +The only thing to worry is that the gadget has to have a single +configuration so a dual RNDIS and CDC ECM gadget won't work unless you +create a proper INF -- and of course, if you do submit it! + +*** Installing drivers for each function + +The other, trickier thing is making Windows install drivers for each +individual function. + +For mass storage it is trivial since Windows detect it's an interface +implementing USB Mass Storage class and selects appropriate driver. + +Things are harder with RDNIS and CDC ACM. + +**** RNDIS + +To make Windows select RNDIS drivers for the first function in the +gadget, one needs to use the [[file:linux.inf]] file provided with this +document. It "attaches" Window's RNDIS driver to the first interface +of the gadget. + +Please note, that while testing we encountered some issues[6] when +RNDIS was not the first interface. You do not need to worry abut it +unless you are trying to develop your own gadget in which case watch +out for this bug. + +**** CDC ACM + +Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM. + +**** Customising the gadget + +If you intend to hack the g_multi gadget be advised that rearranging +functions will obviously change interface numbers for each of the +functionality. As an effect provided INFs won't work since they have +interface numbers hard-coded in them (it's not hard to change those +though[7]). + +This also means, that after experimenting with g_multi and changing +provided functions one should change gadget's vendor and/or product ID +so there will be no collision with other customised gadgets or the +original gadget. + +Failing to comply may cause brain damage after wondering for hours why +things don't work as intended before realising Windows have cached +some drivers information (changing USB port may sometimes help plus +you might try using USBDeview[8] to remove the phantom device). + +**** INF testing + +Provided INF files have been tested on Windows XP SP3, Windows Vista +and Windows 7, all 32-bit versions. It should work on 64-bit versions +as well. It most likesy won't work on Windows prior to Windows XP +SP2. + +** Other systems + +At this moment, drivers for any other systems have not been tested. +Knowing how MacOS is based on BSD and BSD is an Open Source it is +believed that it should (read: "I have no idea whether it will") work +out-of-the-box. + +For more exotic systems I have even less to say... + +Any testing and drivers *are* *welcome*! + +* Authors + +This document has been written by Michal Nazarewicz +([[mailto:[email protected]]]). INF files have been hacked with +support of Marek Szyprowski ([[mailto:[email protected]]]) and +Xiaofan Chen ([[mailto:[email protected]]]) basing on the MS RNDIS +template[9], Microchip's CDC ACM INF file and David Brownell's +([[mailto:[email protected]]]) original INF files. + +* Footnotes + +[1] Remote Network Driver Interface Specification, +[[http://msdn.microsoft.com/en-us/library/ee484414.aspx]]. + +[2] Communications Device Class Abstract Control Model, spec for this +and other USB classes can be found at +[[http://www.usb.org/developers/devclass_docs/]]. + +[3] CDC Ethernet Control Model. + +[4] [[http://msdn.microsoft.com/en-us/library/ff537109(v=VS.85).aspx]] + +[5] [[http://msdn.microsoft.com/en-us/library/ff539234(v=VS.85).aspx]] + +[6] To put it in some other nice words, Windows failed to respond to +any user input. + +[7] You may find [[http://www.cygnal.org/ubb/Forum9/HTML/001050.html]] +useful. + +[8] http://www.nirsoft.net/utils/usb_devices_view.html + +[9] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]]
Documentation/usb/linux-cdc-acm.inf +2 -2
@@ -90,10 +90,10 @@ end of the line. [SourceDisksFiles] [SourceDisksNames] [DeviceList] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 [DeviceList.NTamd64] -%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7 +%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02 ;------------------------------------------------------------------------------
Documentation/usb/linux.inf +3 -3
@@ -18,15 +18,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 ; Decoration for x86 architecture [LinuxDevices.NTx86] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for x64 architecture [LinuxDevices.NTamd64] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ; Decoration for ia64 architecture [LinuxDevices.NTia64] -%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2 +%LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 ;@@@ This is the common setting for setup [ControlFlags]
Signature · 1 line
1.7.1
Re: [PATCHv6.1 09/11] USB: gadget: g_multi: added documentation and INF files
Quoted 9 lines · Michal Nazarewicz
A short documentation of the
g_multidriver along with INF files for Windows XP SP3 are provided.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Sorry about the previous patch -- it was missing the gadget_multi.txt file. Sending corrected version. Maybe I should start drinking coffee after all...
Nah, I finally kicked my coffee habit :)
But could you resend all of these again, so I make sure to get the right ones, I see a few v6.1 for some of these patches.
Seventh time is a charm...
thanks,
greg k-h
Re: [PATCHv6.1 09/11] USB: gadget: g_multi: added documentation and INF files
Quoted 10 lines · Michal Nazarewicz
Quoted 9 lines
A short documentation of the
g_multidriver along with INF files for Windows XP SP3 are provided.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Sorry about the previous patch -- it was missing the gadget_multi.txt file. Sending corrected version. Maybe I should start drinking coffee after all...
Quoted 6 lines · Greg KH
Nah, I finally kicked my coffee habit :)
But could you resend all of these again, so I make sure to get the right ones, I see a few v6.1 for some of these patches.
Seventh time is a charm...
I guess I'll send them on Monday. Maybe someone will have some comments over the weekend. I'd like to avoid any v7.1 patches -- did enough mass on the list for one week. ;)
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
PATCH v5 6/11 USB: gadget: g_multi: code clean up and refactoring
In reply to Greg KHThe Multifunction Compasite Gadget have been cleaned up and refactored so hopefully it looks prettier and works at least as good as before changes.
Among other things this also prevents the possibility to select no configuration with Kconfig options which would result in an unusable driver.
---
Quoted 2 lines · Greg KH
Then you need to say that in the changelog portion of the patch submission :)
As you wish.
drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/multi.c | 262 ++++++++++++++++++++++++------------------- 2 files changed, 147 insertions(+), 116 deletions(-)
drivers/usb/gadget/Kconfig +1 -0
@@ -863,6 +863,7 @@ config USB_G_NOKIA config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" depends on BLOCK && NET + select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial link
drivers/usb/gadget/multi.c +146 -116
403 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCHv6.1 06/11] USB: gadget: g_multi: code clean up and refactoring
Hello.
Quoted 1 line · Michal Nazarewicz
The Multifunction Compasite Gadget have been cleaned up
Looks like I'll be your spell-checker for a while. Fix "compasite" here as
well please.
Quoted 9 lines
and refactored so hopefully it looks prettier and works at least as good as before changes.
Among other things this also prevents the possibility to select no configuration with
Kconfigoptions which would result in an unusable driver.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
WBR, Sergei
Re: [PATCHv6.1 06/11] USB: gadget: g_multi: code clean up and refactoring
Quoted 2 lines · Sergei Shtylyov
Quoted 1 line · Michal Nazarewicz
The Multifunction Compasite Gadget have been cleaned up
Quoted 2 lines · Sergei Shtylyov
Looks like I'll be your spell-checker for a while. Fix "compasite" here as
well please.
Thanks. I'm going to run an aspell on all the patches I'm gonig to send later today so hopefully there won't be any such embarrassing typos.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--
PATCH 1/1 USB: gadget: g_fs: possible invalid pointer reference bug fixed
During __gfs_do_config() some invalid pointers may be left in usb_configuration::interfaces array from previous calls to the __gfs_do_config() for the same configuration. This will always happen if an user space function which has a fewer then the last user space function registers itself. Composite's set_config() function that a pointer after the last interface in usb_configuration::interface is NULL unless the array is full.
This patch makes the __gfs_do_config() make sure that if the usb_configuration::interface is not full then a pointer after the last interface is NULL.
--- drivers/usb/gadget/g_ffs.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
drivers/usb/gadget/g_ffs.c +11 -0
@@ -392,6 +392,17 @@ static int __gfs_do_config(struct usb_configuration *c,if (unlikely (ret <0 ))return ret; +/* After previous do_configs there may be some invalid +* pointers in c->interface array. This happens every time +* a user space function with fewer interfaces than a user +* space function that was run before the new one is run. The +* compasit's set_config() assumes that if there is no more +* then MAX_CONFIG_INTERFACES interfaces in a configuration +* then there is a NULL pointer after the last interface in +* c->interface array. We need to make sure this is true. */ +if (c->next_interface_id <ARRAY_SIZE (c->interface)) + c->interface[c->next_interface_id] =NULL ; +return 0 ; }
Signature · 1 line
1.7.1
Re: [PATCH] USB: gadget: g_fs: possible invalid pointer reference bug fixed
Hello.
Quoted 25 lines · Michal Nazarewicz
During
__gfs_do_config()some invalid pointers may be left inusb_configuration::interfacesarray from previous calls to the__gfs_do_config()for the same configuration. This will always happen if an user space function which has a fewer then the last user space function registers itself. Composite'sset_config()function that a pointer after the last interface inusb_configuration::interfaceis NULL unless the array is full.This patch makes the
__gfs_do_config()make sure that if theusb_configuration::interfaceis not full then a pointer after the last interface is NULL.Signed-off-by Michal Nazarewicz <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- drivers/usb/gadget/g_ffs.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)drivers/usb/gadget/g_ffs.c +0
-0@@ -392,6 +392,17 @@ static int __gfs_do_config(struct usb_configuration *c,if (unlikely (ret <0 ))
drivers/usb/gadget/g_ffs.c static int __gfs_do_config(struct usb_configuration *c, · line 402
Quoted 10 lines
drivers/usb/gadget/g_ffs.c +8
-0return ret; +/* After previous do_configs there may be some invalid +* pointers in c->interface array. This happens every time +* a user space function with fewer interfaces than a user +* space function that was run before the new one is run. The +* compasit's set_config() assumes that if there is no more +* then MAX_CONFIG_INTERFACES interfaces in a configuration +* then there is a NULL pointer after the last interface in +* c->interface array. We need to make sure this is true. */
According to CodingStyle, the preferred style of the multi-line comments
is this:
/*
* bla
* bla
*/
drivers/usb/gadget/g_ffs.c static int __gfs_do_config(struct usb_configuration *c, · line 407
Quoted 5 lines
drivers/usb/gadget/g_ffs.c +3
-0+if (c->next_interface_id <ARRAY_SIZE (c->interface)) + c->interface[c->next_interface_id] =NULL ; +return 0 ; }
WBR, Sergei
Re: [PATCH] USB: gadget: g_fs: possible invalid pointer reference bug fixed
Quoted 17 lines
Quoted 16 lines · Michal Nazarewicz
drivers/usb/gadget/g_ffs.c +8
-0@@ -392,6 +392,17 @@ static int __gfs_do_config(struct usb_configuration *c,if (unlikely (ret <0 ))return ret; +/* After previous do_configs there may be some invalid +* pointers in c->interface array. This happens every time +* a user space function with fewer interfaces than a user +* space function that was run before the new one is run. The +* compasit's set_config() assumes that if there is no more +* then MAX_CONFIG_INTERFACES interfaces in a configuration +* then there is a NULL pointer after the last interface in +* c->interface array. We need to make sure this is true. */
Quoted 7 lines · Sergei Shtylyov
According to CodingStyle, the preferred style of the multi-line comments
is this:/*
* bla
* bla
*/
You are of course correct but on the other hand I have consistently used the incorrect form so far also in g_ffs.c so... I think correcting only this comment would bring inconsistency so I should rather resend it with other (two) comments corrected as well. Anyone thinks I should do that?
And I promise, I will remember to use the correct format in my future files.
Signature · 4 lines
Best regards, _ _ | Humble Liege of Serenely Enlightened Majesty of o' \,=./ `o | Computer Science, Michał "mina86" Nazarewicz (o o) +----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--