I am in the process of extending my HID device as composite device (with Mass storage).
I am trying to tweak the existing code in multi.c (
https://github.com/lgeek/linux-2.6.35.3-imx53/blob/master/drivers/usb/gadget/multi.c) and it appears to be that i can only make it work as mass storage and not able to see the HID device even though i register the HID platform driver.
The base code in multi.c is a composite device with Serial + Mass storage(which right away works with the following command) and i am trying to pretend this as HID + Mass storage.
Originally the HID platform driver registration was done in mx28evk.c (linux-2.6.35.3\arch\arm\mach-mx28\mx28evk.c) and i moved this registration to multi.c and also partial code from hid.c
modprobe g_multi file=/dev/mmcblk0p1 stall=0
I would appreciate to review the following code in multi.c and let me know if i am missing anything here?
/*
* multi.c -- Multifunction Composite driver
*
* Copyright (C) 2008 David Brownell
* Copyright (C) 2008 Nokia Corporation
* Copyright (C) 2009 Samsung Electronics
* Author: Michal Nazarewicz (m.nazarewicz@samsung.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/list.h>
#include <linux/utsname.h>
#if defined USB_ETH_RNDIS
# undef USB_ETH_RNDIS
#endif
#ifdef CONFIG_USB_G_MULTI_RNDIS
# define USB_ETH_RNDIS y
#endif
#define DRIVER_DESC "Multifunction Composite Gadget"
#define DRIVER_VERSION "2009/07/21"
/*-------------------------------------------------------------------------*/
#define MULTI_VENDOR_NUM 0x0525 /* XXX NetChip */
#define MULTI_PRODUCT_NUM 0xa4ab /* XXX */
/*-------------------------------------------------------------------------*/
/*
* kbuild is not very cooperative with respect to linking separately
* compiled library objects into one module. So for now we won't use
* separate compilation ... ensuring init/exit sections work to shrink
* the runtime footprint, and giving us at least some parts of what
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "usbstring.c"
#include "config.c"
#include "epautoconf.c"
#include "f_hid.c"
#include "u_serial.c"
#include "f_acm.c"
#include "f_ecm.c"
#include "f_subset.c"
#ifdef USB_ETH_RNDIS
# include "f_rndis.c"
# include "rndis.c"
#endif
#include "u_ether.c"
#undef DBG /* u_ether.c has broken idea about macros */
#undef VDBG /* so clean up after it */
#undef ERROR
#undef INFO
#include "f_mass_storage.c"
struct hidg_func_node {
struct list_head node;
struct hidg_func_descriptor *func;
};
static LIST_HEAD(hidg_func_list);
/*-------------------------------------------------------------------------*/
static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200),
/* .bDeviceClass = USB_CLASS_COMM, */
/* .bDeviceSubClass = 0, */
/* .bDeviceProtocol = 0, */
.bDeviceClass = 0xEF,
.bDeviceSubClass = 2,
.bDeviceProtocol = 1,
/* .bMaxPacketSize0 = f(hardware) */
/* Vendor and product id can be overridden by module parameters. */
.idVendor = cpu_to_le16(MULTI_VENDOR_NUM),
.idProduct = cpu_to_le16(MULTI_PRODUCT_NUM),
/* .bcdDevice = f(hardware) */
/* .iManufacturer = DYNAMIC */
/* .iProduct = DYNAMIC */
/* NO SERIAL NUMBER */
.bNumConfigurations = 1,
};
static struct usb_otg_descriptor otg_descriptor = {
.bLength = sizeof otg_descriptor,
.bDescriptorType = USB_DT_OTG,
/* REVISIT SRP-only hardware is possible, although
* it would not be called "OTG" ...
*/
.bmAttributes = USB_OTG_SRP | USB_OTG_HNP,
};
static const struct usb_descriptor_header *otg_desc[] = {
(struct usb_descriptor_header *) &otg_descriptor,
NULL,
};
/* string IDs are assigned dynamically */
#define STRING_MANUFACTURER_IDX 0
#define STRING_PRODUCT_IDX 1
static char manufacturer[50];
static struct usb_string strings_dev[] = {
[STRING_MANUFACTURER_IDX].s = manufacturer,
[STRING_PRODUCT_IDX].s = DRIVER_DESC,
{ } /* end of list */
};
static struct usb_gadget_strings stringtab_dev = {
.language = 0x0409, /* en-us */
.strings = strings_dev,
};
static struct usb_gadget_strings *dev_strings[] = {
&stringtab_dev,
NULL,
};
static u8 hostaddr[ETH_ALEN];
/****************************** Configurations ******************************/
static struct fsg_module_parameters mod_data = {
.stall = 1
};
FSG_MODULE_PARAMETERS(/* no prefix */, mod_data);
static struct fsg_common *fsg_common;
#ifdef USB_ETH_RNDIS
static int __init rndis_do_config(struct usb_configuration *c)
{
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
c->descriptors = otg_desc;
c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
ret = rndis_bind_config(c, hostaddr);
if (ret < 0)
return ret;
ret = acm_bind_config(c, 0);
if (ret < 0)
return ret;
ret = fsg_add(c->cdev, c, fsg_common);
if (ret < 0)
return ret;
return 0;
}
static struct usb_configuration rndis_config_driver = {
.label = "Multifunction Composite (RNDIS + MS + ACM)",
.bind = rndis_do_config,
.bConfigurationValue = 2,
/* .iConfiguration = DYNAMIC */
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
};
#endif
#ifdef CONFIG_USB_G_MULTI_CDC
static int __init cdc_do_config(struct usb_configuration *c)
{
struct hidg_func_node *e;
int func = 0, status = 0;
int ret;
printk("__init @@@GSK: cdc_do_config \n");
if (gadget_is_otg(c->cdev->gadget)) {
c->descriptors = otg_desc;
c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
ret = ecm_bind_config(c, hostaddr);
if (ret < 0)
return ret;
/*
ret = acm_bind_config(c, 0);
if (ret < 0)
return ret;
*/
list_for_each_entry(e, &hidg_func_list, node)
{
printk("__init @@@GSK: list_for_each_entry\n");
ret = hidg_bind_config(c, e->func, func++);
if (ret < 0)
return ret;
}
ret = fsg_add(c->cdev, c, fsg_common);
if (ret < 0)
return ret;
return 0;
}
static struct usb_configuration cdc_config_driver = {
.label = "Multifunction Composite (CDC + MS + ACM)",
.bind = cdc_do_config,
.bConfigurationValue = 1,
/* .iConfiguration = DYNAMIC */
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
};
#endif
/****************************** Gadget Bind ******************************/
static int __init multi_bind(struct usb_composite_dev *cdev)
{
struct usb_gadget *gadget = cdev->gadget;
struct list_head *tmp;
int status, gcnum, funcs = 0;
//int status, gcnum;
list_for_each(tmp, &hidg_func_list)
funcs++;
if (!funcs)
return -ENODEV;
if (!can_support_ecm(cdev->gadget)) {
dev_err(&gadget->dev, "controller '%s' not usable\n",
gadget->name);
return -EINVAL;
}
/* set up network link layer
status = gether_setup(cdev->gadget, hostaddr);
if (status < 0)
return status;
*/
/* set up serial link layer
status = gserial_setup(cdev->gadget, 1);
if (status < 0)
goto fail0;*/
/* set up HID */
status = ghid_setup(cdev->gadget, funcs);
if (status < 0)
return status;
/* set up mass storage function */
fsg_common = fsg_common_from_params(0, cdev, &mod_data);
if (IS_ERR(fsg_common)) {
status = PTR_ERR(fsg_common);
goto fail1;
}
gcnum = usb_gadget_controller_number(gadget);
if (gcnum >= 0)
device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);
else {
/* We assume that can_support_ecm() tells the truth;
* but if the controller isn't recognized at all then
* that assumption is a bit more likely to be wrong.
*/
WARNING(cdev, "controller '%s' not recognized\n",
gadget->name);
device_desc.bcdDevice = cpu_to_le16(0x0300 | 0x0099);
}
/* Allocate string descriptor numbers ... note that string
* contents can be overridden by the composite_dev glue.
*/
/* device descriptor strings: manufacturer, product */
snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
init_utsname()->sysname, init_utsname()->release,
gadget->name);
status = usb_string_id(cdev);
if (status < 0)
goto fail2;
strings_dev[STRING_MANUFACTURER_IDX].id = status;
device_desc.iManufacturer = status;
status = usb_string_id(cdev);
if (status < 0)
goto fail2;
strings_dev[STRING_PRODUCT_IDX].id = status;
device_desc.iProduct = status;
#ifdef USB_ETH_RNDIS
/* register our first configuration */
status = usb_add_config(cdev, &rndis_config_driver);
if (status < 0)
goto fail2;
#endif
#ifdef CONFIG_USB_G_MULTI_CDC
/* register our second configuration */
status = usb_add_config(cdev, &cdc_config_driver);
if (status < 0)
goto fail2;
#endif
dev_info(&gadget->dev, DRIVER_DESC ", version: " DRIVER_VERSION "\n");
fsg_common_put(fsg_common);
return 0;
fail2:
fsg_common_put(fsg_common);
fail1:
gserial_cleanup();
fail0:
gether_cleanup();
return status;
}
static int __exit multi_unbind(struct usb_composite_dev *cdev)
{
gserial_cleanup();
gether_cleanup();
ghid_cleanup();
return 0;
}
static int __init multig_plat_driver_probe(struct platform_device *pdev)
{
struct hidg_func_descriptor *func = pdev->dev.platform_data;
struct hidg_func_node *entry;
if (!func) {
dev_err(&pdev->dev, "Platform data missing\n");
return -ENODEV;
}
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (!entry)
return -ENOMEM;
entry->func = func;
list_add_tail(&entry->node, &hidg_func_list);
return 0;
}
static int __devexit multig_plat_driver_remove(struct platform_device *pdev)
{
struct hidg_func_node *e, *n;
list_for_each_entry_safe(e, n, &hidg_func_list, node) {
list_del(&e->node);
kfree(e);
}
return 0;
}
/****************************** Some noise ******************************/
static struct usb_composite_driver multi_driver = {
.name = "g_multi",
.dev = &device_desc,
.strings = dev_strings,
.bind = multi_bind,
.unbind = __exit_p(multi_unbind),
};
static struct platform_driver multig_plat_driver = {
.remove = __devexit_p(multig_plat_driver_remove),
.driver = {
.owner = THIS_MODULE,
.name = "multig",
},
};
static struct hidg_func_descriptor my_hid_data = {
.subclass = 0, /* No subclass */
.protocol = 0, /* Generic */
.report_length = 255,
.report_desc_length = 50,
.report_desc = {
0x06, 0xA0,0xFF, /* USAGE_PAGE (vendor defined) */
0x09, 0x01, /* Usage ID (vendor defined) */
0xa1, 0x01, /* COLLECTION (Application) */
0x09, 0x03, /* Usage ID - vendor defined */
0x15, 0x00, /* Logical Minimum (0) */
0x26, 0xFF,0x03, /* Logical Maximum (255) */
0x75, 0x08, /* Report Size (x bits) */
0x96, 0xFF,0x03, /* Report Count (x fields) */
0x81, 0x02, /* Input (Data, Variable, Absolute) */
0x09, 0x04, /* Usage ID - vendor defined */
0x15, 0x00, /* Logical Minimum (0) */
0x26, 0xFF,0x03, /* Logical Maximum (255) */
0x75, 0x08, /* Report Size (8 bits) */
0x96, 0xFF,0x03, /* Report Count (255 fields) */
0x91, 0x02, /* Output (Data, Variable, Absolute) */
0x09, 0x05, /* Usage ID - vendor defined */
0x15, 0x00, /* Logical Minimum (0) */
0x26, 0xFF,0x03, /* Logical Maximum (255) */
0x75, 0x08, /* Report Size (8 bits) */
0x96, 0xFF,0x03, /* Report Count (255 fields) */
0xB1, 0x02, /* Feature (Data, Variable, Absolute) */
0xc0 /* END_COLLECTION */
}
};
static struct platform_device my_hid = {
.name = "multig",
.id = 0,
.num_resources = 0,
.resource = 0,
.dev.platform_data = &my_hid_data,
};
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Michal Nazarewicz");
MODULE_LICENSE("GPL");
static int __init g_multi_init(void)
{
int status;
status = platform_device_register(&my_hid);
if (status < 0)
{
platform_driver_unregister(&my_hid);
return status;
}
printk("__init GSK: hidg_init\n");
platform_driver_probe(&multig_plat_driver,
multig_plat_driver_probe);
return usb_composite_register(&multi_driver);
}
module_init(g_multi_init);
static void __exit g_multi_cleanup(void)
{
usb_composite_unregister(&multi_driver);
}
module_exit(g_multi_cleanup);
Below is the log when i insert the module and with this i can only see the Mass storage but not HID device.modprobe g_multi file=/dev/mmcblk0p1 stall=0
__init GSK: hidg_init
g_multi gadget: Mass Storage Function, version: 2009/09/11
g_multi gadget: Number of LUNs=1
lun0: LUN: removable file: /dev/mmcblk0p1
__init @@@GSK: cdc_do_config
__init @@@GSK: list_for_each_entry
g_multi gadget: Multifunction Composite Gadget, version: 2009/07/21
g_multi gadget: g_multi ready
fsl-usb2-udc: bind to driver g_multi
root@~$
root@~$ g_multi gadget: high speed config #1: Multifunction Composite (CDC + MS + ACM)
