summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@atosorigin.com>2011-11-24 04:01:29 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-05 17:59:02 +0100
commit8173427d8d95a021963a7d0b63d5399334392eb0 (patch)
tree3a7057f1ea98842095f931a8b80e3f028286837e /drivers/usb/gadget
parent34e5b6029f05884b0dbabeb74183438c8168da6a (diff)
downloadbarebox-8173427d8d95a021963a7d0b63d5399334392eb0.tar.gz
barebox-8173427d8d95a021963a7d0b63d5399334392eb0.tar.xz
usb/gadget: add USB serial connect and disconnect
The serial gadget can only work if the serial function is properly connected on USB trigger (ie. on SET_CONFIGURATION or SET_INTERFACE USB message triggering set_alt() in composite.c). Make this connection and handle also the disconnection in f_serial. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_serial.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c
index 5b7eb2c1c5..b93310573d 100644
--- a/drivers/usb/gadget/f_serial.c
+++ b/drivers/usb/gadget/f_serial.c
@@ -16,7 +16,6 @@
#include "gadget_chips.h"
#include "u_serial.h"
-
/*
* This function packages a simple "generic serial" port with no real
* control mechanisms, just raw data transfer over two bulk endpoints.
@@ -140,6 +139,7 @@ static int gser_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
gser->hs.in, gser->fs.in);
gser->port.out_desc = ep_choose(cdev->gadget,
gser->hs.out, gser->fs.out);
+ gserial_connect(&gser->port, gser->port_num);
}
return 0;
@@ -147,7 +147,10 @@ static int gser_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
static void gser_disable(struct usb_function *f)
{
+ struct f_gser *gser = func_to_gser(f);
+
DBG(cdev, "generic ttyGS%d deactivated\n", gser->port_num);
+ gserial_disconnect(&gser->port);
}
/*-------------------------------------------------------------------------*/