dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

tty-usb-mct-u232: Coding style 

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-07-22 11:14:30 +01:00 committed by Linus Torvalds
parent b31f658b0b
commit e19b2560be
1 changed files with 139 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
drivers/usb/serial/mct_u232.c
View File

@ -33,10 +33,11 @@
* - Fixed an endianess problem with the baudrate selection for PowerPC.
*
* 06-Dec-2001 Martin Hamilton <martinh@gnu.org>
* Added support for the Belkin F5U109 DB9 adaptor
* - Added support for the Belkin F5U109 DB9 adaptor
*
* 30-May-2001 Greg Kroah-Hartman
* switched from using spinlock to a semaphore, which fixes lots of problems.
* - switched from using spinlock to a semaphore, which fixes lots of
* problems.
*
* 04-May-2001 Stelian Pop
* - Set the maximum bulk output size for Sitecom U232-P25 model to 16 bytes
@ -59,7 +60,7 @@
* (lots of things will change if/when the usb-serial core changes to
* handle these issues.
*
* 27-Nov-2000 Wolfgang Grandegger
* 27-Nov-2000 Wolfgang Grandegge
* A version for kernel 2.4.0-test10 released to the Linux community
* (via linux-usb-devel).
*/
@ -73,7 +74,7 @@
#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>
#include "mct_u232.h"
@ -93,22 +94,16 @@ static int debug;
static int mct_u232_startup(struct usb_serial *serial);
static void mct_u232_shutdown(struct usb_serial *serial);
static int mct_u232_open(struct tty_struct *tty,
struct usb_serial_port *port,
struct file *filp);
struct usb_serial_port *port, struct file *filp);
static void mct_u232_close(struct tty_struct *tty,
struct usb_serial_port *port,
struct file *filp);
struct usb_serial_port *port, struct file *filp);
static void mct_u232_read_int_callback(struct urb *urb);
static void mct_u232_set_termios(struct tty_struct *tty,
struct usb_serial_port *port,
struct ktermios * old);
static void mct_u232_break_ctl (struct tty_struct *tty,
int break_state );
static int mct_u232_tiocmget (struct tty_struct *tty,
struct file *file);
static int mct_u232_tiocmset (struct tty_struct *tty,
struct file *file, unsigned int set,
unsigned int clear);
struct usb_serial_port *port, struct ktermios *old);
static void mct_u232_break_ctl(struct tty_struct *tty, int break_state);
static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file);
static int mct_u232_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear);
static void mct_u232_throttle(struct tty_struct *tty);
static void mct_u232_unthrottle(struct tty_struct *tty);
@ -178,23 +173,34 @@ struct mct_u232_private {
* Later day 2.6.0-test kernels have new baud rates like B230400 which
* we do not know how to support. We ignore them for the moment.
*/
static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value, speed_t *result)
static int mct_u232_calculate_baud_rate(struct usb_serial *serial,
speed_t value, speed_t *result)
{
*result = value;
if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID
|| le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_BELKIN_F5U109_PID) {
switch (value) {
case 300: return 0x01;
case 600: return 0x02; /* this one not tested */
case 1200: return 0x03;
case 2400: return 0x04;
case 4800: return 0x06;
case 9600: return 0x08;
case 19200: return 0x09;
case 38400: return 0x0a;
case 57600: return 0x0b;
case 115200: return 0x0c;
case 300:
return 0x01;
case 600:
return 0x02; /* this one not tested */
case 1200:
return 0x03;
case 2400:
return 0x04;
case 4800:
return 0x06;
case 9600:
return 0x08;
case 19200:
return 0x09;
case 38400:
return 0x0a;
case 57600:
return 0x0b;
case 115200:
return 0x0c;
default:
*result = 9600;
return 0x08;
@ -231,7 +237,8 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
unsigned char cts_enable_byte = 0;
speed_t speed;
divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value, &speed));
divisor = cpu_to_le32(mct_u232_calculate_baud_rate(serial, value,
&speed));
rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
MCT_U232_SET_BAUD_RATE_REQUEST,
@ -256,9 +263,9 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
whether data will be transmitted to a device which is not asserting
the 'CTS' signal. If the second message's data byte is zero, data
will be transmitted even if 'CTS' is not asserted (i.e. no hardware
flow control). if the second message's data byte is nonzero (a value
of 1 is used by this driver), data will not be transmitted to a device
which is not asserting 'CTS'.
flow control). if the second message's data byte is nonzero (a
value of 1 is used by this driver), data will not be transmitted to
a device which is not asserting 'CTS'.
*/
rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
@ -270,11 +277,11 @@ static int mct_u232_set_baud_rate(struct tty_struct *tty,
err("Sending USB device request code %d failed (error = %d)",
MCT_U232_SET_UNKNOWN1_REQUEST, rc);
if (port && C_CRTSCTS(tty)) {
if (port && C_CRTSCTS(tty))
cts_enable_byte = 1;
}
dbg("set_baud_rate: send second control message, data = %02X", cts_enable_byte);
dbg("set_baud_rate: send second control message, data = %02X",
cts_enable_byte);
rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
MCT_U232_SET_CTS_REQUEST,
MCT_U232_SET_REQUEST_TYPE,
@ -324,7 +331,8 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
return rc;
} /* mct_u232_set_modem_ctrl */
static int mct_u232_get_modem_stat(struct usb_serial *serial, unsigned char *msr)
static int mct_u232_get_modem_stat(struct usb_serial *serial,
unsigned char *msr)
{
int rc;
rc = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
@ -340,7 +348,8 @@ static int mct_u232_get_modem_stat(struct usb_serial *serial, unsigned char *msr
return rc;
} /* mct_u232_get_modem_stat */
static void mct_u232_msr_to_state(unsigned int *control_state, unsigned char msr)
static void mct_u232_msr_to_state(unsigned int *control_state,
unsigned char msr)
{
/* Translate Control Line states */
if (msr & MCT_U232_MSR_DSR)
@ -388,7 +397,7 @@ static int mct_u232_startup (struct usb_serial *serial)
rport->interrupt_in_urb = NULL;
port->read_urb->context = port;
return (0);
return 0;
} /* mct_u232_startup */
@ -427,7 +436,8 @@ static int mct_u232_open (struct tty_struct *tty,
* it seems to be able to accept only 16 bytes (and that's what
* SniffUSB says too...)
*/
if (le16_to_cpu(serial->dev->descriptor.idProduct) == MCT_U232_SITECOM_PID)
if (le16_to_cpu(serial->dev->descriptor.idProduct)
== MCT_U232_SITECOM_PID)
port->bulk_out_size = 16;
/* Do a defined restart: the normal serial device seems to
@ -546,7 +556,8 @@ static void mct_u232_read_int_callback (struct urb *urb)
}
dbg("%s - port %d", __func__, port->number);
usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data);
/*
* Work-a-round: handle the 'usual' bulk-in pipe here
@ -555,9 +566,8 @@ static void mct_u232_read_int_callback (struct urb *urb)
int i;
tty = port->port.tty;
if (urb->actual_length) {
for (i = 0; i < urb->actual_length ; ++i) {
for (i = 0; i < urb->actual_length ; ++i)
tty_insert_flip_char(tty, data[i], 0);
}
tty_flip_buffer_push(tty);
}
goto exit;
@ -574,7 +584,7 @@ static void mct_u232_read_int_callback (struct urb *urb)
mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
#if 0
/* Not yet handled. See belin_sa.c for further information */
/* Not yet handled. See belkin_sa.c for further information */
/* Now to report any errors */
priv->last_lsr = data[MCT_U232_LSR_INDEX];
/*
@ -822,7 +832,6 @@ static void __exit mct_u232_exit (void)
usb_serial_deregister(&mct_u232_device);
}
module_init(mct_u232_init);
module_exit(mct_u232_exit);