Skip to content

L
linux
Commit 00c7a55d authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: usb gadget serial driver v2.0 

This patch updates the serial gadget driver:

 - The bulk is Al Borcher's version 2.0 updates:

     * Use the new utilities to build config descriptors from tables.

     * Add CDC ACM support, which brings lots of goodness including
       interop with Windows.

     * Work better given PXA 25x hardware automagic.

 - I have a few minor tweaks.

     * Match the recent tty API change:  from_user is gone!!

     * Define new product ID for the CDC ACM version, so Windows
       registry won't get confused by the non-ACM version.

     * Add OTG descriptor

     * Allocates packet buffers more efficiently on platforms like
       OMAP: use kmalloc not the dma-coherent allocator.

Al has some docs on how to talk to Windows this, including an INF file.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 60a31804
Hide whitespace changes
Inline Side-by-side
Showing with 658 additions and 219 deletions
drivers/usb/gadget/Makefile
View file @ 00c7a55d
...@@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o ...@@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o
# #
g_zero-objs := zero.o usbstring.o config.o epautoconf.o g_zero-objs := zero.o usbstring.o config.o epautoconf.o
g_ether-objs := ether.o usbstring.o config.o epautoconf.o g_ether-objs := ether.o usbstring.o config.o epautoconf.o
g_serial-objs := serial.o usbstring.o epautoconf.o g_serial-objs := serial.o usbstring.o config.o epautoconf.o
gadgetfs-objs := inode.o gadgetfs-objs := inode.o
g_file_storage-objs := file_storage.o usbstring.o config.o \ g_file_storage-objs := file_storage.o usbstring.o config.o \
epautoconf.o epautoconf.o
......
drivers/usb/gadget/serial.c
View file @ 00c7a55d
...@@ -123,10 +123,84 @@ do { \ ...@@ -123,10 +123,84 @@ do { \
}) })
/* CDC-ACM Defines and Structures */
#define USB_CDC_SUBCLASS_ACM 2
#define USB_CDC_CTRL_PROTO_NONE 0
#define USB_CDC_CTRL_PROTO_AT 1
#define USB_CDC_CTRL_PROTO_VENDOR 0xff
#define USB_CDC_SUBTYPE_HEADER 0
#define USB_CDC_SUBTYPE_CALL_MGMT 1
#define USB_CDC_SUBTYPE_ACM 2
#define USB_CDC_SUBTYPE_UNION 6
#define USB_CDC_CALL_MGMT_CAP_CALL_MGMT 0x01
#define USB_CDC_CALL_MGMT_CAP_DATA_INTF 0x02
#define USB_CDC_REQ_SET_LINE_CODING 0x20
#define USB_CDC_REQ_GET_LINE_CODING 0x21
#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22
#define USB_CDC_1_STOP_BITS 0
#define USB_CDC_1_5_STOP_BITS 1
#define USB_CDC_2_STOP_BITS 2
#define USB_CDC_NO_PARITY 0
#define USB_CDC_ODD_PARITY 1
#define USB_CDC_EVEN_PARITY 2
#define USB_CDC_MARK_PARITY 3
#define USB_CDC_SPACE_PARITY 4
/* Header Functional Descriptor from CDC spec 5.2.3.1 */
struct usb_cdc_header_desc {
u8 bLength;
u8 bDescriptorType;
u8 bDescriptorSubType;
u16 bcdCDC;
} __attribute__ ((packed));
/* Call Management Descriptor from CDC spec 5.2.3.3 */
struct usb_cdc_call_mgmt_desc {
u8 bLength;
u8 bDescriptorType;
u8 bDescriptorSubType;
u8 bmCapabilities;
u8 bDataInterface;
} __attribute__ ((packed));
/* Abstract Control Management Descriptor from CDC spec 5.2.3.4 */
struct usb_cdc_acm_desc {
u8 bLength;
u8 bDescriptorType;
u8 bDescriptorSubType;
u8 bmCapabilities;
} __attribute__ ((packed));
/* Union Functional Descriptor from CDC spec 5.2.3.8 */
struct usb_cdc_union_desc {
u8 bLength;
u8 bDescriptorType;
u8 bDescriptorSubType;
u8 bMasterInterface0;
u8 bSlaveInterface0;
/* ... and there could be other slave interfaces */
} __attribute__ ((packed));
/* Line Coding Structure from CDC spec 6.2.13 */
struct usb_cdc_line_coding {
u32 dwDTERate;
u8 bCharFormat;
u8 bParityType;
u8 bDataBits;
} __attribute__ ((packed));
/* Defines */ /* Defines */
#define GS_VERSION_STR "v1.0" #define GS_VERSION_STR "v2.0"
#define GS_VERSION_NUM 0x0100 #define GS_VERSION_NUM 0x0200
#define GS_LONG_NAME "Gadget Serial" #define GS_LONG_NAME "Gadget Serial"
#define GS_SHORT_NAME "g_serial" #define GS_SHORT_NAME "g_serial"
...@@ -138,13 +212,13 @@ do { \ ...@@ -138,13 +212,13 @@ do { \
#define GS_NUM_CONFIGS 1 #define GS_NUM_CONFIGS 1
#define GS_NO_CONFIG_ID 0 #define GS_NO_CONFIG_ID 0
#define GS_BULK_CONFIG_ID 2 #define GS_BULK_CONFIG_ID 1
#define GS_ACM_CONFIG_ID 2
#define GS_NUM_INTERFACES 1
#define GS_INTERFACE_ID 0
#define GS_ALT_INTERFACE_ID 0
#define GS_NUM_ENDPOINTS 2 #define GS_MAX_NUM_INTERFACES 2
#define GS_BULK_INTERFACE_ID 0
#define GS_CONTROL_INTERFACE_ID 0
#define GS_DATA_INTERFACE_ID 1
#define GS_MAX_DESC_LEN 256 #define GS_MAX_DESC_LEN 256
...@@ -152,12 +226,27 @@ do { \ ...@@ -152,12 +226,27 @@ do { \
#define GS_DEFAULT_WRITE_Q_SIZE 32 #define GS_DEFAULT_WRITE_Q_SIZE 32
#define GS_DEFAULT_WRITE_BUF_SIZE 8192 #define GS_DEFAULT_WRITE_BUF_SIZE 8192
#define GS_TMP_BUF_SIZE 8192
#define GS_CLOSE_TIMEOUT 15 #define GS_CLOSE_TIMEOUT 15
#define GS_DEFAULT_USE_ACM 0
#define GS_DEFAULT_DTE_RATE 9600
#define GS_DEFAULT_DATA_BITS 8
#define GS_DEFAULT_PARITY USB_CDC_NO_PARITY
#define GS_DEFAULT_CHAR_FORMAT USB_CDC_1_STOP_BITS
/* select highspeed/fullspeed, hiding highspeed if not configured */
#ifdef CONFIG_USB_GADGET_DUALSPEED
#define GS_SPEED_SELECT(is_hs,hs,fs) ((is_hs) ? (hs) : (fs))
#else
#define GS_SPEED_SELECT(is_hs,hs,fs) (fs)
#endif /* CONFIG_USB_GADGET_DUALSPEED */
/* debug settings */ /* debug settings */
#if G_SERIAL_DEBUG #ifdef GS_DEBUG
static int debug = G_SERIAL_DEBUG; static int debug = 1;
#define gs_debug(format, arg...) \ #define gs_debug(format, arg...) \
do { if (debug) printk(KERN_DEBUG format, ## arg); } while(0) do { if (debug) printk(KERN_DEBUG format, ## arg); } while(0)
...@@ -171,17 +260,19 @@ static int debug = G_SERIAL_DEBUG; ...@@ -171,17 +260,19 @@ static int debug = G_SERIAL_DEBUG;
#define gs_debug_level(level, format, arg...) \ #define gs_debug_level(level, format, arg...) \
do { } while(0) do { } while(0)
#endif /* G_SERIAL_DEBUG */ #endif /* GS_DEBUG */
/* Thanks to NetChip Technologies for donating this product ID. /* Thanks to NetChip Technologies for donating this product ID.
* *
* DO NOT REUSE THESE IDs with a protocol-incompatible driver!! Ever!! * DO NOT REUSE THESE IDs with a protocol-incompatible driver!! Ever!!
* Instead: allocate your own, using normal USB-IF procedures. * Instead: allocate your own, using normal USB-IF procedures.
*/ */
#define GS_VENDOR_ID 0x0525 /* NetChip */ #define GS_VENDOR_ID 0x0525 /* NetChip */
#define GS_PRODUCT_ID 0xa4a6 /* Linux-USB Serial Gadget */ #define GS_PRODUCT_ID 0xa4a6 /* Linux-USB Serial Gadget */
#define GS_CDC_PRODUCT_ID 0xa4a7 /* ... as CDC-ACM */
#define GS_LOG2_NOTIFY_INTERVAL 5 /* 1 << 5 == 32 msec */
#define GS_NOTIFY_MAXPACKET 8
/* Structures */ /* Structures */
...@@ -212,6 +303,7 @@ struct gs_port { ...@@ -212,6 +303,7 @@ struct gs_port {
int port_in_use; /* open/close in progress */ int port_in_use; /* open/close in progress */
wait_queue_head_t port_write_wait;/* waiting to write */ wait_queue_head_t port_write_wait;/* waiting to write */
struct gs_buf *port_write_buf; struct gs_buf *port_write_buf;
struct usb_cdc_line_coding port_line_coding;
}; };
/* the device structure holds info for the USB device */ /* the device structure holds info for the USB device */
...@@ -219,8 +311,15 @@ struct gs_dev { ...@@ -219,8 +311,15 @@ struct gs_dev {
struct usb_gadget *dev_gadget; /* gadget device pointer */ struct usb_gadget *dev_gadget; /* gadget device pointer */
spinlock_t dev_lock; /* lock for set/reset config */ spinlock_t dev_lock; /* lock for set/reset config */
int dev_config; /* configuration number */ int dev_config; /* configuration number */
struct usb_ep *dev_notify_ep; /* address of notify endpoint */
struct usb_ep *dev_in_ep; /* address of in endpoint */ struct usb_ep *dev_in_ep; /* address of in endpoint */
struct usb_ep *dev_out_ep; /* address of out endpoint */ struct usb_ep *dev_out_ep; /* address of out endpoint */
struct usb_endpoint_descriptor /* desciptor of notify ep */
*dev_notify_ep_desc;
struct usb_endpoint_descriptor /* descriptor of in endpoint */
*dev_in_ep_desc;
struct usb_endpoint_descriptor /* descriptor of out endpoint */
*dev_out_ep_desc;
struct usb_request *dev_ctrl_req; /* control request */ struct usb_request *dev_ctrl_req; /* control request */
struct list_head dev_req_list; /* list of write requests */ struct list_head dev_req_list; /* list of write requests */
int dev_sched_port; /* round robin port scheduled */ int dev_sched_port; /* round robin port scheduled */
...@@ -237,7 +336,7 @@ static void __exit gs_module_exit(void); ...@@ -237,7 +336,7 @@ static void __exit gs_module_exit(void);
/* tty driver */ /* tty driver */
static int gs_open(struct tty_struct *tty, struct file *file); static int gs_open(struct tty_struct *tty, struct file *file);
static void gs_close(struct tty_struct *tty, struct file *file); static void gs_close(struct tty_struct *tty, struct file *file);
static int gs_write(struct tty_struct *tty, static int gs_write(struct tty_struct *tty,
const unsigned char *buf, int count); const unsigned char *buf, int count);
static void gs_put_char(struct tty_struct *tty, unsigned char ch); static void gs_put_char(struct tty_struct *tty, unsigned char ch);
static void gs_flush_chars(struct tty_struct *tty); static void gs_flush_chars(struct tty_struct *tty);
...@@ -263,12 +362,16 @@ static int gs_bind(struct usb_gadget *gadget); ...@@ -263,12 +362,16 @@ static int gs_bind(struct usb_gadget *gadget);
static void gs_unbind(struct usb_gadget *gadget); static void gs_unbind(struct usb_gadget *gadget);
static int gs_setup(struct usb_gadget *gadget, static int gs_setup(struct usb_gadget *gadget,
const struct usb_ctrlrequest *ctrl); const struct usb_ctrlrequest *ctrl);
static int gs_setup_standard(struct usb_gadget *gadget,
const struct usb_ctrlrequest *ctrl);
static int gs_setup_class(struct usb_gadget *gadget,
const struct usb_ctrlrequest *ctrl);
static void gs_setup_complete(struct usb_ep *ep, struct usb_request *req); static void gs_setup_complete(struct usb_ep *ep, struct usb_request *req);
static void gs_disconnect(struct usb_gadget *gadget); static void gs_disconnect(struct usb_gadget *gadget);
static int gs_set_config(struct gs_dev *dev, unsigned config); static int gs_set_config(struct gs_dev *dev, unsigned config);
static void gs_reset_config(struct gs_dev *dev); static void gs_reset_config(struct gs_dev *dev);
static int gs_build_config_desc(u8 *buf, enum usb_device_speed speed, static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
u8 type, unsigned int index); u8 type, unsigned int index, int is_otg);
static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len,
int kmalloc_flags); int kmalloc_flags);
...@@ -302,6 +405,7 @@ static struct gs_dev *gs_device; ...@@ -302,6 +405,7 @@ static struct gs_dev *gs_device;
static const char *EP_IN_NAME; static const char *EP_IN_NAME;
static const char *EP_OUT_NAME; static const char *EP_OUT_NAME;
static const char *EP_NOTIFY_NAME;
static struct semaphore gs_open_close_sem[GS_NUM_PORTS]; static struct semaphore gs_open_close_sem[GS_NUM_PORTS];
...@@ -310,6 +414,9 @@ static unsigned int write_q_size = GS_DEFAULT_WRITE_Q_SIZE; ...@@ -310,6 +414,9 @@ static unsigned int write_q_size = GS_DEFAULT_WRITE_Q_SIZE;
static unsigned int write_buf_size = GS_DEFAULT_WRITE_BUF_SIZE; static unsigned int write_buf_size = GS_DEFAULT_WRITE_BUF_SIZE;
static unsigned int use_acm = GS_DEFAULT_USE_ACM;
/* tty driver struct */ /* tty driver struct */
static struct tty_operations gs_tty_ops = { static struct tty_operations gs_tty_ops = {
.open = gs_open, .open = gs_open,
...@@ -333,7 +440,7 @@ static struct usb_gadget_driver gs_gadget_driver = { ...@@ -333,7 +440,7 @@ static struct usb_gadget_driver gs_gadget_driver = {
.speed = USB_SPEED_HIGH, .speed = USB_SPEED_HIGH,
#else #else
.speed = USB_SPEED_FULL, .speed = USB_SPEED_FULL,
#endif #endif /* CONFIG_USB_GADGET_DUALSPEED */
.function = GS_LONG_NAME, .function = GS_LONG_NAME,
.bind = gs_bind, .bind = gs_bind,
.unbind = gs_unbind, .unbind = gs_unbind,
...@@ -353,15 +460,21 @@ static struct usb_gadget_driver gs_gadget_driver = { ...@@ -353,15 +460,21 @@ static struct usb_gadget_driver gs_gadget_driver = {
#define GS_MANUFACTURER_STR_ID 1 #define GS_MANUFACTURER_STR_ID 1
#define GS_PRODUCT_STR_ID 2 #define GS_PRODUCT_STR_ID 2
#define GS_SERIAL_STR_ID 3 #define GS_SERIAL_STR_ID 3
#define GS_CONFIG_STR_ID 4 #define GS_BULK_CONFIG_STR_ID 4
#define GS_ACM_CONFIG_STR_ID 5
#define GS_CONTROL_STR_ID 6
#define GS_DATA_STR_ID 7
/* static strings, in iso 8859/1 */ /* static strings, in UTF-8 */
static char manufacturer[40]; static char manufacturer[50];
static struct usb_string gs_strings[] = { static struct usb_string gs_strings[] = {
{ GS_MANUFACTURER_STR_ID, manufacturer }, { GS_MANUFACTURER_STR_ID, manufacturer },
{ GS_PRODUCT_STR_ID, GS_LONG_NAME }, { GS_PRODUCT_STR_ID, GS_LONG_NAME },
{ GS_SERIAL_STR_ID, "0" }, { GS_SERIAL_STR_ID, "0" },
{ GS_CONFIG_STR_ID, "Bulk" }, { GS_BULK_CONFIG_STR_ID, "Gadget Serial Bulk" },
{ GS_ACM_CONFIG_STR_ID, "Gadget Serial CDC ACM" },
{ GS_CONTROL_STR_ID, "Gadget Serial Control" },
{ GS_DATA_STR_ID, "Gadget Serial Data" },
{ } /* end of list */ { } /* end of list */
}; };
...@@ -374,7 +487,8 @@ static struct usb_device_descriptor gs_device_desc = { ...@@ -374,7 +487,8 @@ static struct usb_device_descriptor gs_device_desc = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = __constant_cpu_to_le16(0x0200), .bcdUSB = __constant_cpu_to_le16(0x0200),
.bDeviceClass = USB_CLASS_VENDOR_SPEC, .bDeviceSubClass = 0,
.bDeviceProtocol = 0,
.idVendor = __constant_cpu_to_le16(GS_VENDOR_ID), .idVendor = __constant_cpu_to_le16(GS_VENDOR_ID),
.idProduct = __constant_cpu_to_le16(GS_PRODUCT_ID), .idProduct = __constant_cpu_to_le16(GS_PRODUCT_ID),
.iManufacturer = GS_MANUFACTURER_STR_ID, .iManufacturer = GS_MANUFACTURER_STR_ID,
...@@ -383,23 +497,104 @@ static struct usb_device_descriptor gs_device_desc = { ...@@ -383,23 +497,104 @@ static struct usb_device_descriptor gs_device_desc = {
.bNumConfigurations = GS_NUM_CONFIGS, .bNumConfigurations = GS_NUM_CONFIGS,
}; };
static const struct usb_config_descriptor gs_config_desc = { static struct usb_otg_descriptor gs_otg_descriptor = {
.bLength = sizeof(gs_otg_descriptor),
.bDescriptorType = USB_DT_OTG,
.bmAttributes = USB_OTG_SRP,
};
static struct usb_config_descriptor gs_bulk_config_desc = {
.bLength = USB_DT_CONFIG_SIZE, .bLength = USB_DT_CONFIG_SIZE,
.bDescriptorType = USB_DT_CONFIG, .bDescriptorType = USB_DT_CONFIG,
/* .wTotalLength set by gs_build_config_desc */ /* .wTotalLength computed dynamically */
.bNumInterfaces = GS_NUM_INTERFACES, .bNumInterfaces = 1,
.bConfigurationValue = GS_BULK_CONFIG_ID, .bConfigurationValue = GS_BULK_CONFIG_ID,
.iConfiguration = GS_CONFIG_STR_ID, .iConfiguration = GS_BULK_CONFIG_STR_ID,
.bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
.bMaxPower = 1, .bMaxPower = 1,
}; };
static const struct usb_interface_descriptor gs_interface_desc = { static struct usb_config_descriptor gs_acm_config_desc = {
.bLength = USB_DT_CONFIG_SIZE,
.bDescriptorType = USB_DT_CONFIG,
/* .wTotalLength computed dynamically */
.bNumInterfaces = 2,
.bConfigurationValue = GS_ACM_CONFIG_ID,
.iConfiguration = GS_ACM_CONFIG_STR_ID,
.bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
.bMaxPower = 1,
};
static const struct usb_interface_descriptor gs_bulk_interface_desc = {
.bLength = USB_DT_INTERFACE_SIZE,
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = GS_BULK_INTERFACE_ID,
.bNumEndpoints = 2,
.bInterfaceClass = USB_CLASS_CDC_DATA,
.bInterfaceSubClass = 0,
.bInterfaceProtocol = 0,
.iInterface = GS_DATA_STR_ID,
};
static const struct usb_interface_descriptor gs_control_interface_desc = {
.bLength = USB_DT_INTERFACE_SIZE, .bLength = USB_DT_INTERFACE_SIZE,
.bDescriptorType = USB_DT_INTERFACE, .bDescriptorType = USB_DT_INTERFACE,
.bNumEndpoints = GS_NUM_ENDPOINTS, .bInterfaceNumber = GS_CONTROL_INTERFACE_ID,
.bInterfaceClass = USB_CLASS_VENDOR_SPEC, .bNumEndpoints = 1,
.iInterface = GS_CONFIG_STR_ID, .bInterfaceClass = USB_CLASS_COMM,
.bInterfaceSubClass = USB_CDC_SUBCLASS_ACM,
.bInterfaceProtocol = USB_CDC_CTRL_PROTO_AT,
.iInterface = GS_CONTROL_STR_ID,
};
static const struct usb_interface_descriptor gs_data_interface_desc = {
.bLength = USB_DT_INTERFACE_SIZE,
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = GS_DATA_INTERFACE_ID,
.bNumEndpoints = 2,
.bInterfaceClass = USB_CLASS_CDC_DATA,
.bInterfaceSubClass = 0,
.bInterfaceProtocol = 0,
.iInterface = GS_DATA_STR_ID,
};
static const struct usb_cdc_header_desc gs_header_desc = {
.bLength = sizeof(gs_header_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_SUBTYPE_HEADER,
.bcdCDC = __constant_cpu_to_le16(0x0110),
};
static const struct usb_cdc_call_mgmt_desc gs_call_mgmt_descriptor = {
.bLength = sizeof(gs_call_mgmt_descriptor),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_SUBTYPE_CALL_MGMT,
.bmCapabilities = 0,
.bDataInterface = 1, /* index of data interface */
};
static struct usb_cdc_acm_desc gs_acm_descriptor = {
.bLength = sizeof(gs_acm_descriptor),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_SUBTYPE_ACM,
.bmCapabilities = 0,
};
static const struct usb_cdc_union_desc gs_union_desc = {
.bLength = sizeof(gs_union_desc),
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubType = USB_CDC_SUBTYPE_UNION,
.bMasterInterface0 = 0, /* index of control interface */
.bSlaveInterface0 = 1, /* index of data interface */
};
static struct usb_endpoint_descriptor gs_fullspeed_notify_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = USB_DIR_IN,
.bmAttributes = USB_ENDPOINT_XFER_INT,
.wMaxPacketSize = __constant_cpu_to_le16(GS_NOTIFY_MAXPACKET),
.bInterval = 1 << GS_LOG2_NOTIFY_INTERVAL,
}; };
static struct usb_endpoint_descriptor gs_fullspeed_in_desc = { static struct usb_endpoint_descriptor gs_fullspeed_in_desc = {
...@@ -416,6 +611,38 @@ static struct usb_endpoint_descriptor gs_fullspeed_out_desc = { ...@@ -416,6 +611,38 @@ static struct usb_endpoint_descriptor gs_fullspeed_out_desc = {
.bmAttributes = USB_ENDPOINT_XFER_BULK, .bmAttributes = USB_ENDPOINT_XFER_BULK,
}; };
static const struct usb_descriptor_header *gs_bulk_fullspeed_function[] = {
(struct usb_descriptor_header *) &gs_otg_descriptor,
(struct usb_descriptor_header *) &gs_bulk_interface_desc,
(struct usb_descriptor_header *) &gs_fullspeed_in_desc,
(struct usb_descriptor_header *) &gs_fullspeed_out_desc,
NULL,
};
static const struct usb_descriptor_header *gs_acm_fullspeed_function[] = {
(struct usb_descriptor_header *) &gs_otg_descriptor,
(struct usb_descriptor_header *) &gs_control_interface_desc,
(struct usb_descriptor_header *) &gs_header_desc,
(struct usb_descriptor_header *) &gs_call_mgmt_descriptor,
(struct usb_descriptor_header *) &gs_acm_descriptor,
(struct usb_descriptor_header *) &gs_union_desc,
(struct usb_descriptor_header *) &gs_fullspeed_notify_desc,
(struct usb_descriptor_header *) &gs_data_interface_desc,
(struct usb_descriptor_header *) &gs_fullspeed_in_desc,
(struct usb_descriptor_header *) &gs_fullspeed_out_desc,
NULL,
};
#ifdef CONFIG_USB_GADGET_DUALSPEED
static struct usb_endpoint_descriptor gs_highspeed_notify_desc = {
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = USB_DIR_IN,
.bmAttributes = USB_ENDPOINT_XFER_INT,
.wMaxPacketSize = __constant_cpu_to_le16(GS_NOTIFY_MAXPACKET),
.bInterval = GS_LOG2_NOTIFY_INTERVAL+4,
};
static struct usb_endpoint_descriptor gs_highspeed_in_desc = { static struct usb_endpoint_descriptor gs_highspeed_in_desc = {
.bLength = USB_DT_ENDPOINT_SIZE, .bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT, .bDescriptorType = USB_DT_ENDPOINT,
...@@ -430,16 +657,37 @@ static struct usb_endpoint_descriptor gs_highspeed_out_desc = { ...@@ -430,16 +657,37 @@ static struct usb_endpoint_descriptor gs_highspeed_out_desc = {
.wMaxPacketSize = __constant_cpu_to_le16(512), .wMaxPacketSize = __constant_cpu_to_le16(512),
}; };
#ifdef CONFIG_USB_GADGET_DUALSPEED
static struct usb_qualifier_descriptor gs_qualifier_desc = { static struct usb_qualifier_descriptor gs_qualifier_desc = {
.bLength = sizeof(struct usb_qualifier_descriptor), .bLength = sizeof(struct usb_qualifier_descriptor),
.bDescriptorType = USB_DT_DEVICE_QUALIFIER, .bDescriptorType = USB_DT_DEVICE_QUALIFIER,
.bcdUSB = __constant_cpu_to_le16 (0x0200), .bcdUSB = __constant_cpu_to_le16 (0x0200),
.bDeviceClass = USB_CLASS_VENDOR_SPEC,
/* assumes ep0 uses the same value for both speeds ... */ /* assumes ep0 uses the same value for both speeds ... */
.bNumConfigurations = GS_NUM_CONFIGS, .bNumConfigurations = GS_NUM_CONFIGS,
}; };
#endif
static const struct usb_descriptor_header *gs_bulk_highspeed_function[] = {
(struct usb_descriptor_header *) &gs_otg_descriptor,
(struct usb_descriptor_header *) &gs_bulk_interface_desc,
(struct usb_descriptor_header *) &gs_highspeed_in_desc,
(struct usb_descriptor_header *) &gs_highspeed_out_desc,
NULL,
};
static const struct usb_descriptor_header *gs_acm_highspeed_function[] = {
(struct usb_descriptor_header *) &gs_otg_descriptor,
(struct usb_descriptor_header *) &gs_control_interface_desc,
(struct usb_descriptor_header *) &gs_header_desc,
(struct usb_descriptor_header *) &gs_call_mgmt_descriptor,
(struct usb_descriptor_header *) &gs_acm_descriptor,
(struct usb_descriptor_header *) &gs_union_desc,
(struct usb_descriptor_header *) &gs_highspeed_notify_desc,
(struct usb_descriptor_header *) &gs_data_interface_desc,
(struct usb_descriptor_header *) &gs_highspeed_in_desc,
(struct usb_descriptor_header *) &gs_highspeed_out_desc,
NULL,
};
#endif /* CONFIG_USB_GADGET_DUALSPEED */
/* Module */ /* Module */
...@@ -447,20 +695,23 @@ MODULE_DESCRIPTION(GS_LONG_NAME); ...@@ -447,20 +695,23 @@ MODULE_DESCRIPTION(GS_LONG_NAME);
MODULE_AUTHOR("Al Borchers"); MODULE_AUTHOR("Al Borchers");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#if G_SERIAL_DEBUG #ifdef GS_DEBUG
module_param(debug, int, S_IRUGO | S_IWUSR); module_param(debug, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(debug, "Enable debugging, 0=off, 1=on, larger values for more messages"); MODULE_PARM_DESC(debug, "Enable debugging, 0=off, 1=on");
#endif #endif
module_param(read_q_size, int, 0); module_param(read_q_size, uint, S_IRUGO);
MODULE_PARM_DESC(read_q_size, "Read request queue size, default=32"); MODULE_PARM_DESC(read_q_size, "Read request queue size, default=32");
module_param(write_q_size, int, 0); module_param(write_q_size, uint, S_IRUGO);
MODULE_PARM_DESC(write_q_size, "Write request queue size, default=32"); MODULE_PARM_DESC(write_q_size, "Write request queue size, default=32");
module_param(write_buf_size, int, 0); module_param(write_buf_size, uint, S_IRUGO);
MODULE_PARM_DESC(write_buf_size, "Write buffer size, default=8192"); MODULE_PARM_DESC(write_buf_size, "Write buffer size, default=8192");
module_param(use_acm, uint, S_IRUGO);
MODULE_PARM_DESC(use_acm, "Use CDC ACM, 0=no, 1=yes, default=no");
module_init(gs_module_init); module_init(gs_module_init);
module_exit(gs_module_exit); module_exit(gs_module_exit);
...@@ -538,13 +789,12 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -538,13 +789,12 @@ static int gs_open(struct tty_struct *tty, struct file *file)
struct gs_dev *dev; struct gs_dev *dev;
struct gs_buf *buf; struct gs_buf *buf;
struct semaphore *sem; struct semaphore *sem;
int ret;
port_num = tty->index; port_num = tty->index;
gs_debug("gs_open: (%d,%p,%p)\n", port_num, tty, file); gs_debug("gs_open: (%d,%p,%p)\n", port_num, tty, file);
tty->driver_data = NULL;
if (port_num < 0 || port_num >= GS_NUM_PORTS) { if (port_num < 0 || port_num >= GS_NUM_PORTS) {
printk(KERN_ERR "gs_open: (%d,%p,%p) invalid port number\n", printk(KERN_ERR "gs_open: (%d,%p,%p) invalid port number\n",
port_num, tty, file); port_num, tty, file);
...@@ -573,9 +823,8 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -573,9 +823,8 @@ static int gs_open(struct tty_struct *tty, struct file *file)
printk(KERN_ERR printk(KERN_ERR
"gs_open: (%d,%p,%p) device is not connected\n", "gs_open: (%d,%p,%p) device is not connected\n",
port_num, tty, file); port_num, tty, file);
spin_unlock_irqrestore(&dev->dev_lock, flags); ret = -ENODEV;
up(sem); goto exit_unlock_dev;
return -ENODEV;
} }
port = dev->dev_port[port_num]; port = dev->dev_port[port_num];
...@@ -583,9 +832,8 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -583,9 +832,8 @@ static int gs_open(struct tty_struct *tty, struct file *file)
if (port == NULL) { if (port == NULL) {
printk(KERN_ERR "gs_open: (%d,%p,%p) NULL port pointer\n", printk(KERN_ERR "gs_open: (%d,%p,%p) NULL port pointer\n",
port_num, tty, file); port_num, tty, file);
spin_unlock_irqrestore(&dev->dev_lock, flags); ret = -ENODEV;
up(sem); goto exit_unlock_dev;
return -ENODEV;
} }
spin_lock(&port->port_lock); spin_lock(&port->port_lock);
...@@ -594,20 +842,20 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -594,20 +842,20 @@ static int gs_open(struct tty_struct *tty, struct file *file)
if (port->port_dev == NULL) { if (port->port_dev == NULL) {
printk(KERN_ERR "gs_open: (%d,%p,%p) port disconnected (1)\n", printk(KERN_ERR "gs_open: (%d,%p,%p) port disconnected (1)\n",
port_num, tty, file); port_num, tty, file);
spin_unlock_irqrestore(&port->port_lock, flags); ret = -EIO;
up(sem); goto exit_unlock_port;
return -EIO;
} }
if (port->port_open_count > 0) { if (port->port_open_count > 0) {
++port->port_open_count; ++port->port_open_count;
spin_unlock_irqrestore(&port->port_lock, flags);
gs_debug("gs_open: (%d,%p,%p) already open\n", gs_debug("gs_open: (%d,%p,%p) already open\n",
port_num, tty, file); port_num, tty, file);
up(sem); ret = 0;
return 0; goto exit_unlock_port;
} }
tty->driver_data = NULL;
/* mark port as in use, we can drop port lock and sleep if necessary */ /* mark port as in use, we can drop port lock and sleep if necessary */
port->port_in_use = 1; port->port_in_use = 1;
...@@ -623,18 +871,16 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -623,18 +871,16 @@ static int gs_open(struct tty_struct *tty, struct file *file)
"gs_open: (%d,%p,%p) port disconnected (2)\n", "gs_open: (%d,%p,%p) port disconnected (2)\n",
port_num, tty, file); port_num, tty, file);
port->port_in_use = 0; port->port_in_use = 0;
spin_unlock_irqrestore(&port->port_lock, flags); ret = -EIO;
up(sem); goto exit_unlock_port;
return -EIO;
} }
if ((port->port_write_buf=buf) == NULL) { if ((port->port_write_buf=buf) == NULL) {
printk(KERN_ERR "gs_open: (%d,%p,%p) cannot allocate port write buffer\n", printk(KERN_ERR "gs_open: (%d,%p,%p) cannot allocate port write buffer\n",
port_num, tty, file); port_num, tty, file);
port->port_in_use = 0; port->port_in_use = 0;
spin_unlock_irqrestore(&port->port_lock, flags); ret = -ENOMEM;
up(sem); goto exit_unlock_port;
return -ENOMEM;
} }
} }
...@@ -646,9 +892,8 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -646,9 +892,8 @@ static int gs_open(struct tty_struct *tty, struct file *file)
printk(KERN_ERR "gs_open: (%d,%p,%p) port disconnected (3)\n", printk(KERN_ERR "gs_open: (%d,%p,%p) port disconnected (3)\n",
port_num, tty, file); port_num, tty, file);
port->port_in_use = 0; port->port_in_use = 0;
spin_unlock_irqrestore(&port->port_lock, flags); ret = -EIO;
up(sem); goto exit_unlock_port;
return -EIO;
} }
tty->driver_data = port; tty->driver_data = port;
...@@ -656,12 +901,20 @@ static int gs_open(struct tty_struct *tty, struct file *file) ...@@ -656,12 +901,20 @@ static int gs_open(struct tty_struct *tty, struct file *file)
port->port_open_count = 1; port->port_open_count = 1;
port->port_in_use = 0; port->port_in_use = 0;
gs_debug("gs_open: (%d,%p,%p) completed\n", port_num, tty, file);
ret = 0;
exit_unlock_port:
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
up(sem); up(sem);
return ret;
gs_debug("gs_open: (%d,%p,%p) completed\n", port_num, tty, file); exit_unlock_dev:
spin_unlock_irqrestore(&dev->dev_lock, flags);
up(sem);
return ret;
return 0;
} }
/* /*
...@@ -689,24 +942,18 @@ static void gs_close(struct tty_struct *tty, struct file *file) ...@@ -689,24 +942,18 @@ static void gs_close(struct tty_struct *tty, struct file *file)
printk(KERN_ERR printk(KERN_ERR
"gs_close: (%d,%p,%p) port is already closed\n", "gs_close: (%d,%p,%p) port is already closed\n",
port->port_num, tty, file); port->port_num, tty, file);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
up(sem);
return;
} }
if (port->port_open_count > 0) { if (port->port_open_count > 1) {
--port->port_open_count; --port->port_open_count;
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
up(sem);
return;
} }
/* free disconnected port on final close */ /* free disconnected port on final close */
if (port->port_dev == NULL) { if (port->port_dev == NULL) {
kfree(port); kfree(port);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
up(sem);
return;
} }
/* mark port as closed but in use, we can drop port lock */ /* mark port as closed but in use, we can drop port lock */
...@@ -727,9 +974,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) ...@@ -727,9 +974,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
/* (might have happened during the above sleep) */ /* (might have happened during the above sleep) */
if (port->port_dev == NULL) { if (port->port_dev == NULL) {
kfree(port); kfree(port);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
up(sem);
return;
} }
gs_buf_clear(port->port_write_buf); gs_buf_clear(port->port_write_buf);
...@@ -738,11 +983,12 @@ static void gs_close(struct tty_struct *tty, struct file *file) ...@@ -738,11 +983,12 @@ static void gs_close(struct tty_struct *tty, struct file *file)
port->port_tty = NULL; port->port_tty = NULL;
port->port_in_use = 0; port->port_in_use = 0;
spin_unlock_irqrestore(&port->port_lock, flags);
up(sem);
gs_debug("gs_close: (%d,%p,%p) completed\n", gs_debug("gs_close: (%d,%p,%p) completed\n",
port->port_num, tty, file); port->port_num, tty, file);
exit:
spin_unlock_irqrestore(&port->port_lock, flags);
up(sem);
} }
/* /*
...@@ -752,6 +998,7 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count) ...@@ -752,6 +998,7 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count)
{ {
unsigned long flags; unsigned long flags;
struct gs_port *port = tty->driver_data; struct gs_port *port = tty->driver_data;
int ret;
if (port == NULL) { if (port == NULL) {
printk(KERN_ERR "gs_write: NULL port pointer\n"); printk(KERN_ERR "gs_write: NULL port pointer\n");
...@@ -769,15 +1016,15 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count) ...@@ -769,15 +1016,15 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count)
if (port->port_dev == NULL) { if (port->port_dev == NULL) {
printk(KERN_ERR "gs_write: (%d,%p) port is not connected\n", printk(KERN_ERR "gs_write: (%d,%p) port is not connected\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); ret = -EIO;
return -EIO; goto exit;
} }
if (port->port_open_count == 0) { if (port->port_open_count == 0) {
printk(KERN_ERR "gs_write: (%d,%p) port is closed\n", printk(KERN_ERR "gs_write: (%d,%p) port is closed\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); ret = -EBADF;
return -EBADF; goto exit;
} }
count = gs_buf_put(port->port_write_buf, buf, count); count = gs_buf_put(port->port_write_buf, buf, count);
...@@ -790,6 +1037,10 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count) ...@@ -790,6 +1037,10 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count)
count); count);
return count; return count;
exit:
spin_unlock_irqrestore(&port->port_lock, flags);
return ret;
} }
/* /*
...@@ -812,19 +1063,18 @@ static void gs_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -812,19 +1063,18 @@ static void gs_put_char(struct tty_struct *tty, unsigned char ch)
if (port->port_dev == NULL) { if (port->port_dev == NULL) {
printk(KERN_ERR "gs_put_char: (%d,%p) port is not connected\n", printk(KERN_ERR "gs_put_char: (%d,%p) port is not connected\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
return;
} }
if (port->port_open_count == 0) { if (port->port_open_count == 0) {
printk(KERN_ERR "gs_put_char: (%d,%p) port is closed\n", printk(KERN_ERR "gs_put_char: (%d,%p) port is closed\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
return;
} }
gs_buf_put(port->port_write_buf, &ch, 1); gs_buf_put(port->port_write_buf, &ch, 1);
exit:
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
} }
...@@ -849,20 +1099,23 @@ static void gs_flush_chars(struct tty_struct *tty) ...@@ -849,20 +1099,23 @@ static void gs_flush_chars(struct tty_struct *tty)
printk(KERN_ERR printk(KERN_ERR
"gs_flush_chars: (%d,%p) port is not connected\n", "gs_flush_chars: (%d,%p) port is not connected\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
return;
} }
if (port->port_open_count == 0) { if (port->port_open_count == 0) {
printk(KERN_ERR "gs_flush_chars: (%d,%p) port is closed\n", printk(KERN_ERR "gs_flush_chars: (%d,%p) port is closed\n",
port->port_num, tty); port->port_num, tty);
spin_unlock_irqrestore(&port->port_lock, flags); goto exit;
return;
} }
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
gs_send(gs_device); gs_send(gs_device);
return;
exit:
spin_unlock_irqrestore(&port->port_lock, flags);
} }
/* /*
...@@ -1059,17 +1312,16 @@ static int gs_send_packet(struct gs_dev *dev, char *packet, unsigned int size) ...@@ -1059,17 +1312,16 @@ static int gs_send_packet(struct gs_dev *dev, char *packet, unsigned int size)
if (len < size) if (len < size)
size = len; size = len;
if (size == 0) { if (size == 0)
spin_unlock(&port->port_lock); goto exit;
return 0;
}
size = gs_buf_get(port->port_write_buf, packet, size); size = gs_buf_get(port->port_write_buf, packet, size);
wake_up_interruptible(&port->port_tty->write_wait); if (port->port_tty)
wake_up_interruptible(&port->port_tty->write_wait);
exit:
spin_unlock(&port->port_lock); spin_unlock(&port->port_lock);
return size; return size;
} }
...@@ -1090,6 +1342,7 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size) ...@@ -1090,6 +1342,7 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size)
{ {
unsigned int len; unsigned int len;
struct gs_port *port; struct gs_port *port;
int ret;
/* TEMPORARY -- only port 0 is supported right now */ /* TEMPORARY -- only port 0 is supported right now */
port = dev->dev_port[0]; port = dev->dev_port[0];
...@@ -1102,18 +1355,25 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size) ...@@ -1102,18 +1355,25 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size)
spin_lock(&port->port_lock); spin_lock(&port->port_lock);
if (port->port_open_count == 0) {
printk(KERN_ERR "gs_recv_packet: port=%d, port is closed\n",
port->port_num);
ret = -EIO;
goto exit;
}
if (port->port_tty == NULL) { if (port->port_tty == NULL) {
printk(KERN_ERR "gs_recv_packet: port=%d, NULL tty pointer\n", printk(KERN_ERR "gs_recv_packet: port=%d, NULL tty pointer\n",
port->port_num); port->port_num);
spin_unlock(&port->port_lock); ret = -EIO;
return -EIO; goto exit;
} }
if (port->port_tty->magic != TTY_MAGIC) { if (port->port_tty->magic != TTY_MAGIC) {
printk(KERN_ERR "gs_recv_packet: port=%d, bad tty magic\n", printk(KERN_ERR "gs_recv_packet: port=%d, bad tty magic\n",
port->port_num); port->port_num);
spin_unlock(&port->port_lock); ret = -EIO;
return -EIO; goto exit;
} }
len = (unsigned int)(TTY_FLIPBUF_SIZE - port->port_tty->flip.count); len = (unsigned int)(TTY_FLIPBUF_SIZE - port->port_tty->flip.count);
...@@ -1128,9 +1388,11 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size) ...@@ -1128,9 +1388,11 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet, unsigned int size)
wake_up_interruptible(&port->port_tty->read_wait); wake_up_interruptible(&port->port_tty->read_wait);
} }
spin_unlock(&port->port_lock); ret = 0;
return 0; exit:
spin_unlock(&port->port_lock);
return ret;
} }
/* /*
...@@ -1235,21 +1497,7 @@ static int gs_bind(struct usb_gadget *gadget) ...@@ -1235,21 +1497,7 @@ static int gs_bind(struct usb_gadget *gadget)
struct usb_ep *ep; struct usb_ep *ep;
struct gs_dev *dev; struct gs_dev *dev;
usb_ep_autoconfig_reset(gadget); /* device specific */
ep = usb_ep_autoconfig(gadget, &gs_fullspeed_in_desc);
if (!ep)
goto autoconf_fail;
EP_IN_NAME = ep->name;
ep->driver_data = ep; /* claim the endpoint */
ep = usb_ep_autoconfig(gadget, &gs_fullspeed_out_desc);
if (!ep)
goto autoconf_fail;
EP_OUT_NAME = ep->name;
ep->driver_data = ep; /* claim the endpoint */
/* device specific bcdDevice value in device descriptor */
if (gadget_is_net2280(gadget)) { if (gadget_is_net2280(gadget)) {
gs_device_desc.bcdDevice = gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0001); __constant_cpu_to_le16(GS_VERSION_NUM|0x0001);
...@@ -1259,9 +1507,13 @@ static int gs_bind(struct usb_gadget *gadget) ...@@ -1259,9 +1507,13 @@ static int gs_bind(struct usb_gadget *gadget)
} else if (gadget_is_sh(gadget)) { } else if (gadget_is_sh(gadget)) {
gs_device_desc.bcdDevice = gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0003); __constant_cpu_to_le16(GS_VERSION_NUM|0x0003);
/* sh doesn't support multiple interfaces or configs */
use_acm = 0;
} else if (gadget_is_sa1100(gadget)) { } else if (gadget_is_sa1100(gadget)) {
gs_device_desc.bcdDevice = gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0004); __constant_cpu_to_le16(GS_VERSION_NUM|0x0004);
/* sa1100 doesn't support necessary endpoints */
use_acm = 0;
} else if (gadget_is_goku(gadget)) { } else if (gadget_is_goku(gadget)) {
gs_device_desc.bcdDevice = gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0005); __constant_cpu_to_le16(GS_VERSION_NUM|0x0005);
...@@ -1274,6 +1526,9 @@ static int gs_bind(struct usb_gadget *gadget) ...@@ -1274,6 +1526,9 @@ static int gs_bind(struct usb_gadget *gadget)
} else if (gadget_is_lh7a40x(gadget)) { } else if (gadget_is_lh7a40x(gadget)) {
gs_device_desc.bcdDevice = gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0008); __constant_cpu_to_le16(GS_VERSION_NUM|0x0008);
} else if (gadget_is_n9604(gadget)) {
gs_device_desc.bcdDevice =
__constant_cpu_to_le16(GS_VERSION_NUM|0x0009);
} else { } else {
printk(KERN_WARNING "gs_bind: controller '%s' not recognized\n", printk(KERN_WARNING "gs_bind: controller '%s' not recognized\n",
gadget->name); gadget->name);
...@@ -1282,11 +1537,44 @@ static int gs_bind(struct usb_gadget *gadget) ...@@ -1282,11 +1537,44 @@ static int gs_bind(struct usb_gadget *gadget)
__constant_cpu_to_le16(GS_VERSION_NUM|0x0099); __constant_cpu_to_le16(GS_VERSION_NUM|0x0099);
} }
usb_ep_autoconfig_reset(gadget);
ep = usb_ep_autoconfig(gadget, &gs_fullspeed_in_desc);
if (!ep)
goto autoconf_fail;
EP_IN_NAME = ep->name;
ep->driver_data = ep; /* claim the endpoint */
ep = usb_ep_autoconfig(gadget, &gs_fullspeed_out_desc);
if (!ep)
goto autoconf_fail;
EP_OUT_NAME = ep->name;
ep->driver_data = ep; /* claim the endpoint */
if (use_acm) {
ep = usb_ep_autoconfig(gadget, &gs_fullspeed_notify_desc);
if (!ep) {
printk(KERN_ERR "gs_bind: cannot run ACM on %s\n", gadget->name);
goto autoconf_fail;
}
gs_device_desc.idProduct = __constant_cpu_to_le16(
GS_CDC_PRODUCT_ID),
EP_NOTIFY_NAME = ep->name;
ep->driver_data = ep; /* claim the endpoint */
}
gs_device_desc.bDeviceClass = use_acm
? USB_CLASS_COMM : USB_CLASS_VENDOR_SPEC;
gs_device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket; gs_device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
#ifdef CONFIG_USB_GADGET_DUALSPEED #ifdef CONFIG_USB_GADGET_DUALSPEED
gs_qualifier_desc.bDeviceClass = use_acm
? USB_CLASS_COMM : USB_CLASS_VENDOR_SPEC;
/* assume ep0 uses the same packet size for both speeds */ /* assume ep0 uses the same packet size for both speeds */
gs_qualifier_desc.bMaxPacketSize0 = gs_device_desc.bMaxPacketSize0; gs_qualifier_desc.bMaxPacketSize0 = gs_device_desc.bMaxPacketSize0;
/* assume endpoints are dual-speed */ /* assume endpoints are dual-speed */
gs_highspeed_notify_desc.bEndpointAddress =
gs_fullspeed_notify_desc.bEndpointAddress;
gs_highspeed_in_desc.bEndpointAddress = gs_highspeed_in_desc.bEndpointAddress =
gs_fullspeed_in_desc.bEndpointAddress; gs_fullspeed_in_desc.bEndpointAddress;
gs_highspeed_out_desc.bEndpointAddress = gs_highspeed_out_desc.bEndpointAddress =
...@@ -1295,11 +1583,17 @@ static int gs_bind(struct usb_gadget *gadget) ...@@ -1295,11 +1583,17 @@ static int gs_bind(struct usb_gadget *gadget)
usb_gadget_set_selfpowered(gadget); usb_gadget_set_selfpowered(gadget);
if (gadget->is_otg) {
gs_otg_descriptor.bmAttributes |= USB_OTG_HNP,
gs_bulk_config_desc.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
gs_acm_config_desc.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
gs_device = dev = kmalloc(sizeof(struct gs_dev), GFP_KERNEL); gs_device = dev = kmalloc(sizeof(struct gs_dev), GFP_KERNEL);
if (dev == NULL) if (dev == NULL)
return -ENOMEM; return -ENOMEM;
snprintf (manufacturer, sizeof(manufacturer), snprintf(manufacturer, sizeof(manufacturer),
UTS_SYSNAME " " UTS_RELEASE " with %s", gadget->name); UTS_SYSNAME " " UTS_RELEASE " with %s", gadget->name);
memset(dev, 0, sizeof(struct gs_dev)); memset(dev, 0, sizeof(struct gs_dev));
...@@ -1349,8 +1643,10 @@ static void gs_unbind(struct usb_gadget *gadget) ...@@ -1349,8 +1643,10 @@ static void gs_unbind(struct usb_gadget *gadget)
/* read/write requests already freed, only control request remains */ /* read/write requests already freed, only control request remains */
if (dev != NULL) { if (dev != NULL) {
if (dev->dev_ctrl_req != NULL) if (dev->dev_ctrl_req != NULL) {
gs_free_req(gadget->ep0, dev->dev_ctrl_req); gs_free_req(gadget->ep0, dev->dev_ctrl_req);
dev->dev_ctrl_req = NULL;
}
gs_free_ports(dev); gs_free_ports(dev);
kfree(dev); kfree(dev);
set_gadget_data(gadget, NULL); set_gadget_data(gadget, NULL);
...@@ -1369,10 +1665,51 @@ static void gs_unbind(struct usb_gadget *gadget) ...@@ -1369,10 +1665,51 @@ static void gs_unbind(struct usb_gadget *gadget)
* Returns the size of the data sent to the host, or a negative * Returns the size of the data sent to the host, or a negative
* error number. * error number.
*/ */
static int gs_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) static int gs_setup(struct usb_gadget *gadget,
const struct usb_ctrlrequest *ctrl)
{
int ret = -EOPNOTSUPP;
struct gs_dev *dev = get_gadget_data(gadget);
struct usb_request *req = dev->dev_ctrl_req;
switch (ctrl->bRequestType & USB_TYPE_MASK) {
case USB_TYPE_STANDARD:
ret = gs_setup_standard(gadget,ctrl);
break;
case USB_TYPE_CLASS:
ret = gs_setup_class(gadget,ctrl);
break;
default:
printk(KERN_ERR "gs_setup: unknown request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n",
ctrl->bRequestType, ctrl->bRequest, ctrl->wValue,
ctrl->wIndex, ctrl->wLength);
break;
}
/* respond with data transfer before status phase? */
if (ret >= 0) {
req->length = ret;
req->zero = ret < ctrl->wLength
&& (ret % gadget->ep0->maxpacket) == 0;
ret = usb_ep_queue(gadget->ep0, req, GFP_ATOMIC);
if (ret < 0) {
printk(KERN_ERR "gs_setup: cannot queue response, ret=%d\n",
ret);
req->status = 0;
gs_setup_complete(gadget->ep0, req);
}
}
/* device either stalls (ret < 0) or reports success */
return ret;
}
static int gs_setup_standard(struct usb_gadget *gadget,
const struct usb_ctrlrequest *ctrl)
{ {
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
unsigned int sv_config;
struct gs_dev *dev = get_gadget_data(gadget); struct gs_dev *dev = get_gadget_data(gadget);
struct usb_request *req = dev->dev_ctrl_req; struct usb_request *req = dev->dev_ctrl_req;
...@@ -1398,10 +1735,14 @@ static int gs_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctr ...@@ -1398,10 +1735,14 @@ static int gs_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctr
break; break;
case USB_DT_OTHER_SPEED_CONFIG: case USB_DT_OTHER_SPEED_CONFIG:
if (!gadget->is_dualspeed)
break;
/* fall through */
#endif /* CONFIG_USB_GADGET_DUALSPEED */ #endif /* CONFIG_USB_GADGET_DUALSPEED */
case USB_DT_CONFIG: case USB_DT_CONFIG:
ret = gs_build_config_desc(req->buf, gadget->speed, ret = gs_build_config_buf(req->buf, gadget->speed,
ctrl->wValue >> 8, ctrl->wValue & 0xff); ctrl->wValue >> 8, ctrl->wValue & 0xff,
gadget->is_otg);
if (ret >= 0) if (ret >= 0)
ret = min(ctrl->wLength, (u16)ret); ret = min(ctrl->wLength, (u16)ret);
break; break;
...@@ -1432,59 +1773,106 @@ static int gs_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctr ...@@ -1432,59 +1773,106 @@ static int gs_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctr
break; break;
case USB_REQ_SET_INTERFACE: case USB_REQ_SET_INTERFACE:
if (ctrl->bRequestType != USB_RECIP_INTERFACE) if (ctrl->bRequestType != USB_RECIP_INTERFACE
|| !dev->dev_config || ctrl->wIndex >= GS_MAX_NUM_INTERFACES)
break; break;
spin_lock(&dev->dev_lock);
if (dev->dev_config == GS_BULK_CONFIG_ID if (dev->dev_config == GS_BULK_CONFIG_ID
&& ctrl->wIndex == GS_INTERFACE_ID && ctrl->wIndex != GS_BULK_INTERFACE_ID)
&& ctrl->wValue == GS_ALT_INTERFACE_ID) { break;
sv_config = dev->dev_config; /* no alternate interface settings */
/* since there is only one interface, setting the */ if (ctrl->wValue != 0)
/* interface is equivalent to setting the config */ break;
gs_reset_config(dev); spin_lock(&dev->dev_lock);
gs_set_config(dev, sv_config); /* PXA hardware partially handles SET_INTERFACE;
ret = 0; * we need to kluge around that interference. */
if (gadget_is_pxa(gadget)) {
ret = gs_set_config(dev, use_acm ?
GS_ACM_CONFIG_ID : GS_BULK_CONFIG_ID);
goto set_interface_done;
} }
if (dev->dev_config != GS_BULK_CONFIG_ID
&& ctrl->wIndex == GS_CONTROL_INTERFACE_ID) {
if (dev->dev_notify_ep) {
usb_ep_disable(dev->dev_notify_ep);
usb_ep_enable(dev->dev_notify_ep, dev->dev_notify_ep_desc);
}
} else {
usb_ep_disable(dev->dev_in_ep);
usb_ep_disable(dev->dev_out_ep);
usb_ep_enable(dev->dev_in_ep, dev->dev_in_ep_desc);
usb_ep_enable(dev->dev_out_ep, dev->dev_out_ep_desc);
}
ret = 0;
set_interface_done:
spin_unlock(&dev->dev_lock); spin_unlock(&dev->dev_lock);
break; break;
case USB_REQ_GET_INTERFACE: case USB_REQ_GET_INTERFACE:
if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE)) if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE)
|| dev->dev_config == GS_NO_CONFIG_ID)
break; break;
if (dev->dev_config == GS_NO_CONFIG_ID) if (ctrl->wIndex >= GS_MAX_NUM_INTERFACES
break; || (dev->dev_config == GS_BULK_CONFIG_ID
if (ctrl->wIndex != GS_INTERFACE_ID) { && ctrl->wIndex != GS_BULK_INTERFACE_ID)) {
ret = -EDOM; ret = -EDOM;
break; break;
} }
*(u8 *)req->buf = GS_ALT_INTERFACE_ID; /* no alternate interface settings */
*(u8 *)req->buf = 0;
ret = min(ctrl->wLength, (u16)1); ret = min(ctrl->wLength, (u16)1);
break; break;
default: default:
printk(KERN_ERR "gs_setup: unknown request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n", printk(KERN_ERR "gs_setup: unknown standard request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n",
ctrl->bRequestType, ctrl->bRequest, ctrl->wValue, ctrl->bRequestType, ctrl->bRequest, ctrl->wValue,
ctrl->wIndex, ctrl->wLength); ctrl->wIndex, ctrl->wLength);
break; break;
} }
/* respond with data transfer before status phase? */ return ret;
if (ret >= 0) { }
req->length = ret;
req->zero = ret < ctrl->wLength static int gs_setup_class(struct usb_gadget *gadget,
&& (ret % gadget->ep0->maxpacket) == 0; const struct usb_ctrlrequest *ctrl)
ret = usb_ep_queue(gadget->ep0, req, GFP_ATOMIC); {
if (ret < 0) { int ret = -EOPNOTSUPP;
printk(KERN_ERR struct gs_dev *dev = get_gadget_data(gadget);
"gs_setup: cannot queue response, ret=%d\n", struct gs_port *port = dev->dev_port[0]; /* ACM only has one port */
ret); struct usb_request *req = dev->dev_ctrl_req;
req->status = 0;
gs_setup_complete(gadget->ep0, req); switch (ctrl->bRequest) {
case USB_CDC_REQ_SET_LINE_CODING:
ret = min(ctrl->wLength,
(u16)sizeof(struct usb_cdc_line_coding));
if (port) {
spin_lock(&port->port_lock);
memcpy(&port->port_line_coding, req->buf, ret);
spin_unlock(&port->port_lock);
}
break;
case USB_CDC_REQ_GET_LINE_CODING:
port = dev->dev_port[0]; /* ACM only has one port */
ret = min(ctrl->wLength,
(u16)sizeof(struct usb_cdc_line_coding));
if (port) {
spin_lock(&port->port_lock);
memcpy(req->buf, &port->port_line_coding, ret);
spin_unlock(&port->port_lock);
} }
break;
case USB_CDC_REQ_SET_CONTROL_LINE_STATE:
ret = 0;
break;
default:
printk(KERN_ERR "gs_setup: unknown class request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n",
ctrl->bRequestType, ctrl->bRequest, ctrl->wValue,
ctrl->wIndex, ctrl->wLength);
break;
} }
/* device either stalls (ret < 0) or reports success */
return ret; return ret;
} }
...@@ -1543,6 +1931,7 @@ static int gs_set_config(struct gs_dev *dev, unsigned config) ...@@ -1543,6 +1931,7 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
int ret = 0; int ret = 0;
struct usb_gadget *gadget = dev->dev_gadget; struct usb_gadget *gadget = dev->dev_gadget;
struct usb_ep *ep; struct usb_ep *ep;
struct usb_endpoint_descriptor *ep_desc;
struct usb_request *req; struct usb_request *req;
struct gs_req_entry *req_entry; struct gs_req_entry *req_entry;
...@@ -1556,55 +1945,90 @@ static int gs_set_config(struct gs_dev *dev, unsigned config) ...@@ -1556,55 +1945,90 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
gs_reset_config(dev); gs_reset_config(dev);
if (config == GS_NO_CONFIG_ID) switch (config) {
case GS_NO_CONFIG_ID:
return 0; return 0;
case GS_BULK_CONFIG_ID:
if (config != GS_BULK_CONFIG_ID) if (use_acm)
return -EINVAL;
/* device specific optimizations */
if (gadget_is_net2280(gadget))
net2280_set_fifo_mode(gadget, 1);
break;
case GS_ACM_CONFIG_ID:
if (!use_acm)
return -EINVAL;
/* device specific optimizations */
if (gadget_is_net2280(gadget))
net2280_set_fifo_mode(gadget, 1);
break;
default:
return -EINVAL; return -EINVAL;
}
/* device specific optimizations */ dev->dev_config = config;
if (gadget_is_net2280(gadget))
net2280_set_fifo_mode(gadget, 1);
gadget_for_each_ep(ep, gadget) { gadget_for_each_ep(ep, gadget) {
if (strcmp(ep->name, EP_IN_NAME) == 0) { if (EP_NOTIFY_NAME
ret = usb_ep_enable(ep, && strcmp(ep->name, EP_NOTIFY_NAME) == 0) {
gadget->speed == USB_SPEED_HIGH ? ep_desc = GS_SPEED_SELECT(
&gs_highspeed_in_desc : &gs_fullspeed_in_desc); gadget->speed == USB_SPEED_HIGH,
&gs_highspeed_notify_desc,
&gs_fullspeed_notify_desc);
ret = usb_ep_enable(ep,ep_desc);
if (ret == 0) {
ep->driver_data = dev;
dev->dev_notify_ep = ep;
dev->dev_notify_ep_desc = ep_desc;
} else {
printk(KERN_ERR "gs_set_config: cannot enable notify endpoint %s, ret=%d\n",
ep->name, ret);
goto exit_reset_config;
}
}
else if (strcmp(ep->name, EP_IN_NAME) == 0) {
ep_desc = GS_SPEED_SELECT(
gadget->speed == USB_SPEED_HIGH,
&gs_highspeed_in_desc,
&gs_fullspeed_in_desc);
ret = usb_ep_enable(ep,ep_desc);
if (ret == 0) { if (ret == 0) {
ep->driver_data = dev; ep->driver_data = dev;
dev->dev_in_ep = ep; dev->dev_in_ep = ep;
dev->dev_in_ep_desc = ep_desc;
} else { } else {
printk(KERN_ERR "gs_set_config: cannot enable in endpoint %s, ret=%d\n", printk(KERN_ERR "gs_set_config: cannot enable in endpoint %s, ret=%d\n",
ep->name, ret); ep->name, ret);
gs_reset_config(dev); goto exit_reset_config;
return ret;
} }
} }
else if (strcmp(ep->name, EP_OUT_NAME) == 0) { else if (strcmp(ep->name, EP_OUT_NAME) == 0) {
ret = usb_ep_enable(ep, ep_desc = GS_SPEED_SELECT(
gadget->speed == USB_SPEED_HIGH ? gadget->speed == USB_SPEED_HIGH,
&gs_highspeed_out_desc : &gs_highspeed_out_desc,
&gs_fullspeed_out_desc); &gs_fullspeed_out_desc);
ret = usb_ep_enable(ep,ep_desc);
if (ret == 0) { if (ret == 0) {
ep->driver_data = dev; ep->driver_data = dev;
dev->dev_out_ep = ep; dev->dev_out_ep = ep;
dev->dev_out_ep_desc = ep_desc;
} else { } else {
printk(KERN_ERR "gs_set_config: cannot enable out endpoint %s, ret=%d\n", printk(KERN_ERR "gs_set_config: cannot enable out endpoint %s, ret=%d\n",
ep->name, ret); ep->name, ret);
gs_reset_config(dev); goto exit_reset_config;
return ret;
} }
} }
} }
if (dev->dev_in_ep == NULL || dev->dev_out_ep == NULL) { if (dev->dev_in_ep == NULL || dev->dev_out_ep == NULL
gs_reset_config(dev); || (config != GS_BULK_CONFIG_ID && dev->dev_notify_ep == NULL)) {
printk(KERN_ERR "gs_set_config: cannot find endpoints\n"); printk(KERN_ERR "gs_set_config: cannot find endpoints\n");
return -ENODEV; ret = -ENODEV;
goto exit_reset_config;
} }
/* allocate and queue read requests */ /* allocate and queue read requests */
...@@ -1617,10 +2041,9 @@ static int gs_set_config(struct gs_dev *dev, unsigned config) ...@@ -1617,10 +2041,9 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
ret); ret);
} }
} else { } else {
gs_reset_config(dev); printk(KERN_ERR "gs_set_config: cannot allocate read requests\n");
printk(KERN_ERR ret = -ENOMEM;
"gs_set_config: cannot allocate read requests\n"); goto exit_reset_config;
return -ENOMEM;
} }
} }
...@@ -1631,20 +2054,22 @@ static int gs_set_config(struct gs_dev *dev, unsigned config) ...@@ -1631,20 +2054,22 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
req_entry->re_req->complete = gs_write_complete; req_entry->re_req->complete = gs_write_complete;
list_add(&req_entry->re_entry, &dev->dev_req_list); list_add(&req_entry->re_entry, &dev->dev_req_list);
} else { } else {
gs_reset_config(dev); printk(KERN_ERR "gs_set_config: cannot allocate write requests\n");
printk(KERN_ERR ret = -ENOMEM;
"gs_set_config: cannot allocate write requests\n"); goto exit_reset_config;
return -ENOMEM;
} }
} }
dev->dev_config = config; printk(KERN_INFO "gs_set_config: %s configured, %s speed %s config\n",
printk(KERN_INFO "gs_set_config: %s configured for %s speed\n",
GS_LONG_NAME, GS_LONG_NAME,
gadget->speed == USB_SPEED_HIGH ? "high" : "full"); gadget->speed == USB_SPEED_HIGH ? "high" : "full",
config == GS_BULK_CONFIG_ID ? "BULK" : "CDC-ACM");
return 0; return 0;
exit_reset_config:
gs_reset_config(dev);
return ret;
} }
/* /*
...@@ -1681,6 +2106,10 @@ static void gs_reset_config(struct gs_dev *dev) ...@@ -1681,6 +2106,10 @@ static void gs_reset_config(struct gs_dev *dev)
/* disable endpoints, forcing completion of pending i/o; */ /* disable endpoints, forcing completion of pending i/o; */
/* completion handlers free their requests in this case */ /* completion handlers free their requests in this case */
if (dev->dev_notify_ep) {
usb_ep_disable(dev->dev_notify_ep);
dev->dev_notify_ep = NULL;
}
if (dev->dev_in_ep) { if (dev->dev_in_ep) {
usb_ep_disable(dev->dev_in_ep); usb_ep_disable(dev->dev_in_ep);
dev->dev_in_ep = NULL; dev->dev_in_ep = NULL;
...@@ -1692,41 +2121,48 @@ static void gs_reset_config(struct gs_dev *dev) ...@@ -1692,41 +2121,48 @@ static void gs_reset_config(struct gs_dev *dev)
} }
/* /*
* gs_build_config_desc * gs_build_config_buf
* *
* Builds a config descriptor in the given buffer and returns the * Builds the config descriptors in the given buffer and returns the
* length, or a negative error number. * length, or a negative error number.
*/ */
static int gs_build_config_desc(u8 *buf, enum usb_device_speed speed, u8 type, unsigned int index) static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
u8 type, unsigned int index, int is_otg)
{ {
int len;
int high_speed; int high_speed;
int len = USB_DT_CONFIG_SIZE + USB_DT_INTERFACE_SIZE const struct usb_config_descriptor *config_desc;
+ GS_NUM_ENDPOINTS * USB_DT_ENDPOINT_SIZE; const struct usb_descriptor_header **function;
/* only one config */ if (index >= gs_device_desc.bNumConfigurations)
if (index != 0)
return -EINVAL; return -EINVAL;
memcpy(buf, &gs_config_desc, USB_DT_CONFIG_SIZE);
((struct usb_config_descriptor *)buf)->bDescriptorType = type;
((struct usb_config_descriptor *)buf)->wTotalLength = __constant_cpu_to_le16(len);
buf += USB_DT_CONFIG_SIZE;
memcpy(buf, &gs_interface_desc, USB_DT_INTERFACE_SIZE);
buf += USB_DT_INTERFACE_SIZE;
/* other speed switches high and full speed */ /* other speed switches high and full speed */
high_speed = (speed == USB_SPEED_HIGH); high_speed = (speed == USB_SPEED_HIGH);
if (type == USB_DT_OTHER_SPEED_CONFIG) if (type == USB_DT_OTHER_SPEED_CONFIG)
high_speed = !high_speed; high_speed = !high_speed;
memcpy(buf, if (use_acm) {
high_speed ? &gs_highspeed_in_desc : &gs_fullspeed_in_desc, config_desc = &gs_acm_config_desc;
USB_DT_ENDPOINT_SIZE); function = GS_SPEED_SELECT(high_speed,
buf += USB_DT_ENDPOINT_SIZE; gs_acm_highspeed_function,
memcpy(buf, gs_acm_fullspeed_function);
high_speed ? &gs_highspeed_out_desc : &gs_fullspeed_out_desc, } else {
USB_DT_ENDPOINT_SIZE); config_desc = &gs_bulk_config_desc;
function = GS_SPEED_SELECT(high_speed,
gs_bulk_highspeed_function,
gs_bulk_fullspeed_function);
}
/* for now, don't advertise srp-only devices */
if (!is_otg)
function++;
len = usb_gadget_config_buf(config_desc, buf, GS_MAX_DESC_LEN, function);
if (len < 0)
return len;
((struct usb_config_descriptor *)buf)->bDescriptorType = type;
return len; return len;
} }
...@@ -1748,8 +2184,7 @@ static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, int ...@@ -1748,8 +2184,7 @@ static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, int
if (req != NULL) { if (req != NULL) {
req->length = len; req->length = len;
req->buf = usb_ep_alloc_buffer(ep, len, &req->dma, req->buf = kmalloc(len, kmalloc_flags);
kmalloc_flags);
if (req->buf == NULL) { if (req->buf == NULL) {
usb_ep_free_request(ep, req); usb_ep_free_request(ep, req);
return NULL; return NULL;
...@@ -1767,9 +2202,7 @@ static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, int ...@@ -1767,9 +2202,7 @@ static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len, int
static void gs_free_req(struct usb_ep *ep, struct usb_request *req) static void gs_free_req(struct usb_ep *ep, struct usb_request *req)
{ {
if (ep != NULL && req != NULL) { if (ep != NULL && req != NULL) {
if (req->buf != NULL) kfree(req->buf);
usb_ep_free_buffer(ep, req->buf, req->dma,
req->length);
usb_ep_free_request(ep, req); usb_ep_free_request(ep, req);
} }
} }
...@@ -1836,6 +2269,10 @@ static int gs_alloc_ports(struct gs_dev *dev, int kmalloc_flags) ...@@ -1836,6 +2269,10 @@ static int gs_alloc_ports(struct gs_dev *dev, int kmalloc_flags)
memset(port, 0, sizeof(struct gs_port)); memset(port, 0, sizeof(struct gs_port));
port->port_dev = dev; port->port_dev = dev;
port->port_num = i; port->port_num = i;
port->port_line_coding.dwDTERate = GS_DEFAULT_DTE_RATE;
port->port_line_coding.bCharFormat = GS_DEFAULT_CHAR_FORMAT;
port->port_line_coding.bParityType = GS_DEFAULT_PARITY;
port->port_line_coding.bDataBits = GS_DEFAULT_DATA_BITS;
spin_lock_init(&port->port_lock); spin_lock_init(&port->port_lock);
init_waitqueue_head(&port->port_write_wait); init_waitqueue_head(&port->port_write_wait);
...@@ -1878,8 +2315,10 @@ static void gs_free_ports(struct gs_dev *dev) ...@@ -1878,8 +2315,10 @@ static void gs_free_ports(struct gs_dev *dev)
if (port->port_open_count > 0 || port->port_in_use) { if (port->port_open_count > 0 || port->port_in_use) {
port->port_dev = NULL; port->port_dev = NULL;
wake_up_interruptible(&port->port_write_wait); wake_up_interruptible(&port->port_write_wait);
wake_up_interruptible(&port->port_tty->read_wait); if (port->port_tty) {
wake_up_interruptible(&port->port_tty->write_wait); wake_up_interruptible(&port->port_tty->read_wait);
wake_up_interruptible(&port->port_tty->write_wait);
}
} else { } else {
kfree(port); kfree(port);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7