Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: serial: generalise generic read implementation

Browse source 
Add process_read_urb to usb_serial_driver so that a driver can rely on
the generic read (and throttle) mechanism but still do device specific
processing of incoming data (such as adding tty_flags before pushing to
line discipline).

The default generic implementation handles sysrq for consoles but
otherwise simply pushes to tty.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold 2010-03-17 23:05:57 +01:00 committed by Greg Kroah-Hartman
parent 0f3d5bae2b
commit 2315432064
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/usb/serial/generic.c
View file

@ -408,7 +408,7 @@ int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
} }
EXPORT_SYMBOL_GPL(usb_serial_generic_submit_read_urb); EXPORT_SYMBOL_GPL(usb_serial_generic_submit_read_urb);
static void usb_serial_generic_process_read_urb(struct urb *urb) void usb_serial_generic_process_read_urb(struct urb *urb)
{ {
struct usb_serial_port *port = urb->context; struct usb_serial_port *port = urb->context;
struct tty_struct *tty; struct tty_struct *tty;
@ -433,6 +433,7 @@ static void usb_serial_generic_process_read_urb(struct urb *urb)
tty_flip_buffer_push(tty); tty_flip_buffer_push(tty);
tty_kref_put(tty); tty_kref_put(tty);
} }
EXPORT_SYMBOL_GPL(usb_serial_generic_process_read_urb);
void usb_serial_generic_read_bulk_callback(struct urb *urb) void usb_serial_generic_read_bulk_callback(struct urb *urb)
{ {
@ -451,7 +452,7 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb)
usb_serial_debug_data(debug, &port->dev, __func__, usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data); urb->actual_length, data);
usb_serial_generic_process_read_urb(urb); port->serial->type->process_read_urb(urb);
/* Throttle the device if requested by tty */ /* Throttle the device if requested by tty */
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);

1
drivers/usb/serial/usb-serial.c
View file

@ -1298,6 +1298,7 @@ static void fixup_generic(struct usb_serial_driver *device)
set_to_generic_if_null(device, write_bulk_callback); set_to_generic_if_null(device, write_bulk_callback);
set_to_generic_if_null(device, disconnect); set_to_generic_if_null(device, disconnect);
set_to_generic_if_null(device, release); set_to_generic_if_null(device, release);
set_to_generic_if_null(device, process_read_urb);
} }
int usb_serial_register(struct usb_serial_driver *driver) int usb_serial_register(struct usb_serial_driver *driver)

3
include/linux/usb/serial.h
View file

@ -272,6 +272,8 @@ struct usb_serial_driver {
void (*write_int_callback)(struct urb *urb); void (*write_int_callback)(struct urb *urb);
void (*read_bulk_callback)(struct urb *urb); void (*read_bulk_callback)(struct urb *urb);
void (*write_bulk_callback)(struct urb *urb); void (*write_bulk_callback)(struct urb *urb);
/* Called by the generic read bulk callback */
void (*process_read_urb)(struct urb *urb);
}; };
#define to_usb_serial_driver(d) \ #define to_usb_serial_driver(d) \
container_of(d, struct usb_serial_driver, driver) container_of(d, struct usb_serial_driver, driver)
@ -323,6 +325,7 @@ extern int usb_serial_generic_register(int debug);
extern void usb_serial_generic_deregister(void); extern void usb_serial_generic_deregister(void);
extern int usb_serial_generic_submit_read_urb(struct usb_serial_port *port, extern int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
gfp_t mem_flags); gfp_t mem_flags);
extern void usb_serial_generic_process_read_urb(struct urb *urb);
extern int usb_serial_handle_sysrq_char(struct tty_struct *tty, extern int usb_serial_handle_sysrq_char(struct tty_struct *tty,
struct usb_serial_port *port, struct usb_serial_port *port,
unsigned int ch); unsigned int ch);