USB: add gadget_connected and fsg.luns[1] for usb gadget

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
old mode 100644 (file)
new mode 100755 (executable)
index 6712beb..5d4b962
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -763,8 +763,9 @@ static int mass_storage_function_init(struct android_usb_function *f,
        if (!config)
                return -ENOMEM;
 
-       config->fsg.nluns = 1;
+       config->fsg.nluns = 2;
        config->fsg.luns[0].removable = 1;
+       config->fsg.luns[1].removable = 1;
 
        common = fsg_common_init(NULL, cdev, &config->fsg);
        if (IS_ERR(common)) {
@@ -775,6 +776,9 @@ static int mass_storage_function_init(struct android_usb_function *f,
        err = sysfs_create_link(&f->dev->kobj,
                                &common->luns[0].dev.kobj,
                                "lun");
+       err = sysfs_create_link(&f->dev->kobj,
+                               &common->luns[1].dev.kobj,
+                               "lun1");
        if (err) {
                kfree(config);
                return err;

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index b331472cd307b659843d665eed35a2b3acf0cb29..fd045a6d04e1ceacc1a9546f07597edf20c2f8a4 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -21,6 +21,7 @@
 #include <linux/usb/composite.h>
 #include <asm/unaligned.h>
 
+static int gadget_connected = 0;
 /*
  * The code in this file is utility code, used to build a gadget driver
  * from one or more "function" drivers, one or more "configuration"
@@ -698,6 +699,8 @@ static int set_config(struct usb_composite_dev *cdev,
 
        /* when we return, be sure our power usage is valid */
        power = c->MaxPower ? c->MaxPower : CONFIG_USB_GADGET_VBUS_DRAW;
+       /* usb gadget connect flag */
+       gadget_connected = 1;
 done:
        usb_gadget_vbus_draw(gadget, power);
        if (result >= 0 && cdev->delayed_status)
@@ -1497,9 +1500,15 @@ void composite_disconnect(struct usb_gadget *gadget)
                reset_config(cdev);
        if (cdev->driver->disconnect)
                cdev->driver->disconnect(cdev);
+       /* usb gadget connect flag */
+       gadget_connected = 0;
        spin_unlock_irqrestore(&cdev->lock, flags);
 }
 
+int get_gadget_connect_flag( void )
+{
+       return gadget_connected;
+}
 /*-------------------------------------------------------------------------*/
 
 static ssize_t composite_show_suspended(struct device *dev,