Skip to content

L
linux-davinci
Commit e514adb0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: aten2011: fix up the set_uart_reg function 

Name it something sane, and fix up the code to be cleaner.

Cc: Russell Lang <gsview@ghostgum.com.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e9abe30d
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 86 deletions
drivers/staging/uc2322/aten2011.c
View file @ e514adb0
...@@ -230,8 +230,6 @@ static int debug = 0; ...@@ -230,8 +230,6 @@ static int debug = 0;
static int RS485mode = 0; static int RS485mode = 0;
/* setting and get register values */ /* setting and get register values */
static int ATEN2011_set_Uart_Reg(struct usb_serial_port *port, __u16 reg,
__u16 val);
static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg, static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg,
__u16 * val); __u16 * val);
...@@ -289,45 +287,35 @@ static int get_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 *val) ...@@ -289,45 +287,35 @@ static int get_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 *val)
return ret; return ret;
} }
static int ATEN2011_set_Uart_Reg(struct usb_serial_port *port, __u16 reg, static int set_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 val)
__u16 val)
{ {
struct usb_device *dev = port->serial->dev; struct usb_device *dev = port->serial->dev;
struct ATENINTL_serial *ATEN2011_serial; struct ATENINTL_serial *a_serial;
int minor; __u16 minor;
ATEN2011_serial = ATEN2011_get_serial_private(port->serial);
a_serial = ATEN2011_get_serial_private(port->serial);
minor = port->serial->minor; minor = port->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR) if (minor == SERIAL_TTY_NO_MINOR)
minor = 0; minor = 0;
val = val & 0x00ff; val = val & 0x00ff;
// For the UART control registers, the application number need to be Or'ed
if (ATEN2011_serial->ATEN2011_spectrum_2or4ports == 4) { /*
val |= (((__u16) port->number - (__u16) (minor)) + 1) << 8; * For the UART control registers,
DPRINTK("ATEN2011_set_Uart_Reg application number is %x\n", * the application number need to be Or'ed
val); */
} else { if (a_serial->ATEN2011_spectrum_2or4ports == 4)
if (((__u16) port->number - (__u16) (minor)) == 0) { val |= (((__u16)port->number - minor) + 1) << 8;
// val= 0x100; else {
val |= if (((__u16) port->number - minor) == 0)
(((__u16) port->number - (__u16) (minor)) + 1) << 8; val |= (((__u16)port->number - minor) + 1) << 8;
DPRINTK else
("ATEN2011_set_Uart_Reg application number is %x\n", val |= (((__u16)port->number - minor) + 2) << 8;
val);
} else {
// val=0x300;
val |=
(((__u16) port->number - (__u16) (minor)) + 2) << 8;
DPRINTK
("ATEN2011_set_Uart_Reg application number is %x\n",
val);
}
} }
dbg("%s: application number is %x\n", __func__, val);
return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ATEN_WRREQ, return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ATEN_WRREQ,
ATEN_WR_RTYPE, val, reg, NULL, 0, ATEN_WR_RTYPE, val, reg, NULL, 0,
ATEN_WDR_TIMEOUT); ATEN_WDR_TIMEOUT);
} }
static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg, static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg,
...@@ -880,8 +868,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -880,8 +868,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
Data = 0xC0; Data = 0xC0;
else else
Data = 0x00; Data = 0x00;
status = 0; status = set_uart_reg(port, SCRATCH_PAD_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, SCRATCH_PAD_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("Writing SCRATCH_PAD_REGISTER failed status-0x%x\n", DPRINTK("Writing SCRATCH_PAD_REGISTER failed status-0x%x\n",
status); status);
...@@ -914,37 +901,32 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -914,37 +901,32 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
//////////////////////////////////// ////////////////////////////////////
Data = 0x00; Data = 0x00;
status = 0; status = set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("disableing interrupts failed\n"); DPRINTK("disableing interrupts failed\n");
return -1; return -1;
} }
// Set FIFO_CONTROL_REGISTER to the default value // Set FIFO_CONTROL_REGISTER to the default value
Data = 0x00; Data = 0x00;
status = 0; status = set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n"); DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n");
return -1; return -1;
} }
Data = 0xcf; //chk Data = 0xcf; //chk
status = 0; status = set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n"); DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n");
return -1; return -1;
} }
Data = 0x03; //LCR_BITS_8 Data = 0x03; //LCR_BITS_8
status = 0; status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
ATEN2011_port->shadowLCR = Data; ATEN2011_port->shadowLCR = Data;
Data = 0x0b; // MCR_DTR|MCR_RTS|MCR_MASTER_IE Data = 0x0b; // MCR_DTR|MCR_RTS|MCR_MASTER_IE
status = 0; status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
ATEN2011_port->shadowMCR = Data; ATEN2011_port->shadowMCR = Data;
#ifdef Check #ifdef Check
...@@ -954,16 +936,13 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -954,16 +936,13 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
ATEN2011_port->shadowLCR = Data; ATEN2011_port->shadowLCR = Data;
Data |= SERIAL_LCR_DLAB; //data latch enable in LCR 0x80 Data |= SERIAL_LCR_DLAB; //data latch enable in LCR 0x80
status = 0; status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
Data = 0x0c; Data = 0x0c;
status = 0; status = set_uart_reg(port, DIVISOR_LATCH_LSB, Data);
status = ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_LSB, Data);
Data = 0x0; Data = 0x0;
status = 0; status = set_uart_reg(port, DIVISOR_LATCH_MSB, Data);
status = ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_MSB, Data);
Data = 0x00; Data = 0x00;
status = 0; status = 0;
...@@ -971,8 +950,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -971,8 +950,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
// Data = ATEN2011_port->shadowLCR; //data latch disable // Data = ATEN2011_port->shadowLCR; //data latch disable
Data = Data & ~SERIAL_LCR_DLAB; Data = Data & ~SERIAL_LCR_DLAB;
status = 0; status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
ATEN2011_port->shadowLCR = Data; ATEN2011_port->shadowLCR = Data;
#endif #endif
//clearing Bulkin and Bulkout Fifo //clearing Bulkin and Bulkout Fifo
...@@ -987,8 +965,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -987,8 +965,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
//Finally enable all interrupts //Finally enable all interrupts
Data = 0x0; Data = 0x0;
Data = 0x0c; Data = 0x0c;
status = 0; status = set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
//clearing rx_disable //clearing rx_disable
Data = 0x0; Data = 0x0;
...@@ -1284,9 +1261,9 @@ static void ATEN2011_close(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1284,9 +1261,9 @@ static void ATEN2011_close(struct tty_struct *tty, struct usb_serial_port *port,
} }
// clear the MCR & IER // clear the MCR & IER
Data = 0x00; Data = 0x00;
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data); set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
Data = 0x00; Data = 0x00;
ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data); set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
//ATEN2011_get_Uart_Reg(port,MODEM_CONTROL_REGISTER,&Data1); //ATEN2011_get_Uart_Reg(port,MODEM_CONTROL_REGISTER,&Data1);
//printk("value of MCR after closing the port is : 0x%x\n",Data1); //printk("value of MCR after closing the port is : 0x%x\n",Data1);
...@@ -1367,8 +1344,7 @@ static void ATEN2011_break(struct tty_struct *tty, int break_state) ...@@ -1367,8 +1344,7 @@ static void ATEN2011_break(struct tty_struct *tty, int break_state)
ATEN2011_port->shadowLCR = data; ATEN2011_port->shadowLCR = data;
DPRINTK("ATEN2011_break ATEN2011_port->shadowLCR is %x\n", DPRINTK("ATEN2011_break ATEN2011_port->shadowLCR is %x\n",
ATEN2011_port->shadowLCR); ATEN2011_port->shadowLCR);
ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, set_uart_reg(port, LINE_CONTROL_REGISTER, ATEN2011_port->shadowLCR);
ATEN2011_port->shadowLCR);
return; return;
} }
...@@ -1546,10 +1522,8 @@ static void ATEN2011_throttle(struct tty_struct *tty) ...@@ -1546,10 +1522,8 @@ static void ATEN2011_throttle(struct tty_struct *tty)
/* if we are implementing RTS/CTS, toggle that line */ /* if we are implementing RTS/CTS, toggle that line */
if (tty->termios->c_cflag & CRTSCTS) { if (tty->termios->c_cflag & CRTSCTS) {
ATEN2011_port->shadowMCR &= ~MCR_RTS; ATEN2011_port->shadowMCR &= ~MCR_RTS;
status = 0; status = set_uart_reg(port, MODEM_CONTROL_REGISTER,
status = ATEN2011_port->shadowMCR);
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER,
ATEN2011_port->shadowMCR);
if (status < 0) { if (status < 0) {
return; return;
...@@ -1592,10 +1566,8 @@ static void ATEN2011_unthrottle(struct tty_struct *tty) ...@@ -1592,10 +1566,8 @@ static void ATEN2011_unthrottle(struct tty_struct *tty)
/* if we are implementing RTS/CTS, toggle that line */ /* if we are implementing RTS/CTS, toggle that line */
if (tty->termios->c_cflag & CRTSCTS) { if (tty->termios->c_cflag & CRTSCTS) {
ATEN2011_port->shadowMCR |= MCR_RTS; ATEN2011_port->shadowMCR |= MCR_RTS;
status = 0; status = set_uart_reg(port, MODEM_CONTROL_REGISTER,
status = ATEN2011_port->shadowMCR);
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER,
ATEN2011_port->shadowMCR);
if (status < 0) { if (status < 0) {
return; return;
} }
...@@ -1671,8 +1643,7 @@ static int ATEN2011_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -1671,8 +1643,7 @@ static int ATEN2011_tiocmset(struct tty_struct *tty, struct file *file,
ATEN2011_port->shadowMCR = mcr; ATEN2011_port->shadowMCR = mcr;
status = 0; status = set_uart_reg(port, MODEM_CONTROL_REGISTER, mcr);
status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, mcr);
if (status < 0) { if (status < 0) {
DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n"); DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n");
return -1; return -1;
...@@ -1841,8 +1812,7 @@ static int set_modem_info(struct ATENINTL_port *ATEN2011_port, unsigned int cmd, ...@@ -1841,8 +1812,7 @@ static int set_modem_info(struct ATENINTL_port *ATEN2011_port, unsigned int cmd,
ATEN2011_port->shadowMCR = mcr; ATEN2011_port->shadowMCR = mcr;
Data = ATEN2011_port->shadowMCR; Data = ATEN2011_port->shadowMCR;
status = 0; status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n"); DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n");
return -1; return -1;
...@@ -2083,12 +2053,10 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port ...@@ -2083,12 +2053,10 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port
#ifdef HW_flow_control #ifdef HW_flow_control
//NOTE: need to see the pther register to modify //NOTE: need to see the pther register to modify
//setting h/w flow control bit to 1; //setting h/w flow control bit to 1;
status = 0;
//Data = ATEN2011_port->shadowMCR ; //Data = ATEN2011_port->shadowMCR ;
Data = 0x2b; Data = 0x2b;
ATEN2011_port->shadowMCR = Data; ATEN2011_port->shadowMCR = Data;
status = status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("Writing spreg failed in set_serial_baud\n"); DPRINTK("Writing spreg failed in set_serial_baud\n");
return -1; return -1;
...@@ -2098,12 +2066,10 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port ...@@ -2098,12 +2066,10 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port
} else { } else {
#ifdef HW_flow_control #ifdef HW_flow_control
//setting h/w flow control bit to 0; //setting h/w flow control bit to 0;
status = 0;
//Data = ATEN2011_port->shadowMCR ; //Data = ATEN2011_port->shadowMCR ;
Data = 0xb; Data = 0xb;
ATEN2011_port->shadowMCR = Data; ATEN2011_port->shadowMCR = Data;
status = status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) { if (status < 0) {
DPRINTK("Writing spreg failed in set_serial_baud\n"); DPRINTK("Writing spreg failed in set_serial_baud\n");
return -1; return -1;
...@@ -2140,21 +2106,21 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port ...@@ -2140,21 +2106,21 @@ static int ATEN2011_send_cmd_write_baud_rate(struct ATENINTL_port
/* Enable access to divisor latch */ /* Enable access to divisor latch */
Data = ATEN2011_port->shadowLCR | SERIAL_LCR_DLAB; Data = ATEN2011_port->shadowLCR | SERIAL_LCR_DLAB;
ATEN2011_port->shadowLCR = Data; ATEN2011_port->shadowLCR = Data;
ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data); set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
/* Write the divisor */ /* Write the divisor */
Data = (unsigned char)(divisor & 0xff); Data = (unsigned char)(divisor & 0xff);
DPRINTK("set_serial_baud Value to write DLL is %x\n", Data); DPRINTK("set_serial_baud Value to write DLL is %x\n", Data);
ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_LSB, Data); set_uart_reg(port, DIVISOR_LATCH_LSB, Data);
Data = (unsigned char)((divisor & 0xff00) >> 8); Data = (unsigned char)((divisor & 0xff00) >> 8);
DPRINTK("set_serial_baud Value to write DLM is %x\n", Data); DPRINTK("set_serial_baud Value to write DLM is %x\n", Data);
ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_MSB, Data); set_uart_reg(port, DIVISOR_LATCH_MSB, Data);
/* Disable access to divisor latch */ /* Disable access to divisor latch */
Data = ATEN2011_port->shadowLCR & ~SERIAL_LCR_DLAB; Data = ATEN2011_port->shadowLCR & ~SERIAL_LCR_DLAB;
ATEN2011_port->shadowLCR = Data; ATEN2011_port->shadowLCR = Data;
ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data); set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
} }
...@@ -2264,24 +2230,24 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty, ...@@ -2264,24 +2230,24 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty,
ATEN2011_port->shadowLCR); ATEN2011_port->shadowLCR);
/* Disable Interrupts */ /* Disable Interrupts */
Data = 0x00; Data = 0x00;
ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data); set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
Data = 0x00; Data = 0x00;
ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data); set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
Data = 0xcf; Data = 0xcf;
ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data); set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
/* Send the updated LCR value to the ATEN2011 */ /* Send the updated LCR value to the ATEN2011 */
Data = ATEN2011_port->shadowLCR; Data = ATEN2011_port->shadowLCR;
ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data); set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
Data = 0x00b; Data = 0x00b;
ATEN2011_port->shadowMCR = Data; ATEN2011_port->shadowMCR = Data;
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data); set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
Data = 0x00b; Data = 0x00b;
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data); set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
/* set up the MCR register and send it to the ATEN2011 */ /* set up the MCR register and send it to the ATEN2011 */
...@@ -2298,7 +2264,7 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty, ...@@ -2298,7 +2264,7 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty,
} }
Data = ATEN2011_port->shadowMCR; Data = ATEN2011_port->shadowMCR;
ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data); set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
/* Determine divisor based on baud rate */ /* Determine divisor based on baud rate */
baud = tty_get_baud_rate(tty); baud = tty_get_baud_rate(tty);
...@@ -2314,7 +2280,7 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty, ...@@ -2314,7 +2280,7 @@ static void ATEN2011_change_port_settings(struct tty_struct *tty,
/* Enable Interrupts */ /* Enable Interrupts */
Data = 0x0c; Data = 0x0c;
ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data); set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
if (ATEN2011_port->read_urb->status != -EINPROGRESS) { if (ATEN2011_port->read_urb->status != -EINPROGRESS) {
ATEN2011_port->read_urb->dev = serial->dev; ATEN2011_port->read_urb->dev = serial->dev;
......
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