#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/serial.h>
+#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>
-#include <asm/uaccess.h>
#define ZLP_REG1 0x3A /* Zero_Flag_Reg1 58 */
#define ATENINTL_DEVICE_ID_2011 0x2011
#define ATENINTL_DEVICE_ID_7820 0x7820
-static struct usb_device_id id_table [] = {
- { USB_DEVICE(USB_VENDOR_ID_ATENINTL,ATENINTL_DEVICE_ID_2011) },
- { USB_DEVICE(USB_VENDOR_ID_ATENINTL,ATENINTL_DEVICE_ID_7820) },
+static struct usb_device_id id_table[] = {
+ { USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_2011) },
+ { USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_7820) },
{ } /* terminating entry */
};
-MODULE_DEVICE_TABLE (usb, id_table);
+MODULE_DEVICE_TABLE(usb, id_table);
/* This structure holds all of the local port information */
-struct ATENINTL_port
-{
+struct ATENINTL_port {
int port_num; /*Actual port number in the device(1,2,etc)*/
__u8 bulk_out_endpoint; /* the bulk out endpoint handle */
- unsigned char *bulk_out_buffer; /* buffer used for the bulk out endpoint */
- struct urb *write_urb; /* write URB for this port */
- __u8 bulk_in_endpoint; /* the bulk in endpoint handle */
- unsigned char *bulk_in_buffer; /* the buffer we use for the bulk in endpoint */
- struct urb *read_urb; /* read URB for this port */
+ unsigned char *bulk_out_buffer; /* buffer used for the bulk out endpoint */
+ struct urb *write_urb; /* write URB for this port */
+ __u8 bulk_in_endpoint; /* the bulk in endpoint handle */
+ unsigned char *bulk_in_buffer; /* the buffer we use for the bulk in endpoint */
+ struct urb *read_urb; /* read URB for this port */
__u8 shadowLCR; /* last LCR value received */
__u8 shadowMCR; /* last MCR value received */
char open;
struct async_icount icount;
struct usb_serial_port *port; /* loop back to the owner of this object */
/*Offsets*/
- __u8 SpRegOffset;
- __u8 ControlRegOffset;
- __u8 DcrRegOffset;
- //for processing control URBS in interrupt context
+ __u8 SpRegOffset;
+ __u8 ControlRegOffset;
+ __u8 DcrRegOffset;
+ /* for processing control URBS in interrupt context */
struct urb *control_urb;
- // __le16 rx_creg;
- char *ctrl_buf;
- int MsrLsr;
+ char *ctrl_buf;
+ int MsrLsr;
- struct urb *write_urb_pool[NUM_URBS];
+ struct urb *write_urb_pool[NUM_URBS];
/* we pass a pointer to this as the arguement sent to cypress_set_termios old_termios */
- struct ktermios tmp_termios; /* stores the old termios settings */
+ struct ktermios tmp_termios; /* stores the old termios settings */
spinlock_t lock; /* private lock */
};
-
/* This structure holds all of the individual serial device information */
-struct ATENINTL_serial
-{
+struct ATENINTL_serial {
__u8 interrupt_in_endpoint; /* the interrupt endpoint handle */
- unsigned char *interrupt_in_buffer; /* the buffer we use for the interrupt endpoint */
- struct urb * interrupt_read_urb; /* our interrupt urb */
+ unsigned char *interrupt_in_buffer; /* the buffer we use for the interrupt endpoint */
+ struct urb *interrupt_read_urb; /* our interrupt urb */
__u8 bulk_in_endpoint; /* the bulk in endpoint handle */
- unsigned char *bulk_in_buffer; /* the buffer we use for the bulk in endpoint */
+ unsigned char *bulk_in_buffer; /* the buffer we use for the bulk in endpoint */
struct urb *read_urb; /* our bulk read urb */
__u8 bulk_out_endpoint; /* the bulk out endpoint handle */
struct usb_serial *serial; /* loop back to the owner of this object */
- int ATEN2011_spectrum_2or4ports; //this says the number of ports in the device
- // Indicates about the no.of opened ports of an individual USB-serial adapater.
+ int ATEN2011_spectrum_2or4ports; /* this says the number of ports in the device */
+ /* Indicates about the no.of opened ports of an individual USB-serial adapater. */
unsigned int NoOfOpenPorts;
- // a flag for Status endpoint polling
+ /* a flag for Status endpoint polling */
unsigned char status_polling_started;
};
#define ATEN2011_MSR_CD 0x80 /* Current state of CD */
-/* 1: Enables the debugging -- 0: Disable the debugging */
-#define ATEN_DEBUG 0
-
-#ifdef ATEN_DEBUG
-static int debug = 0;
-#define DPRINTK(fmt, args...) printk( "%s: " fmt, __FUNCTION__ , ## args)
-
-#else
-static int debug = 0;
-#define DPRINTK(fmt, args...)
-
-#endif
+static int debug;
/*
* Version Information
/* set to 1 for RS485 mode and 0 for RS232 mode */
/* FIXME make this somehow dynamic and not build time specific */
-static int RS485mode = 0;
-
-static struct usb_serial *ATEN2011_get_usb_serial(struct usb_serial_port *port, const
- char *function);
-static int ATEN2011_serial_paranoia_check(struct usb_serial *serial, const char
- *function);
-static int ATEN2011_port_paranoia_check(struct usb_serial_port *port, const char
- *function);
-
-/* setting and get register values */
-static int ATEN2011_set_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 val);
-static int ATEN2011_get_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 * val);
-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,
- __u16 * val);
-
-static void ATEN2011_Dump_serial_port(struct ATENINTL_port *ATEN2011_port);
-
-
-static inline void ATEN2011_set_serial_private(struct usb_serial *serial,
- struct ATENINTL_serial *data)
-{
- usb_set_serial_data(serial, (void *)data);
-}
-
-static inline struct ATENINTL_serial *ATEN2011_get_serial_private(struct
- usb_serial
- *serial)
-{
- return (struct ATENINTL_serial *)usb_get_serial_data(serial);
-}
-
-static inline void ATEN2011_set_port_private(struct usb_serial_port *port,
- struct ATENINTL_port *data)
-{
- usb_set_serial_port_data(port, (void *)data);
-}
-
-static inline struct ATENINTL_port *ATEN2011_get_port_private(struct
- usb_serial_port
- *port)
-{
- return (struct ATENINTL_port *)usb_get_serial_port_data(port);
-}
+static int RS485mode;
-static int ATEN2011_set_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 val)
+static int set_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 val)
{
struct usb_device *dev = port->serial->dev;
val = val & 0x00ff;
- DPRINTK("ATEN2011_set_reg_sync offset is %x, value %x\n", reg, val);
+
+ dbg("%s: is %x, value %x", __func__, reg, val);
return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ATEN_WRREQ,
ATEN_WR_RTYPE, val, reg, NULL, 0,
ATEN_WDR_TIMEOUT);
}
-static int ATEN2011_get_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 * val)
+static int get_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 *val)
{
struct usb_device *dev = port->serial->dev;
- int ret = 0;
+ int ret;
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), ATEN_RDREQ,
ATEN_RD_RTYPE, 0, reg, val, VENDOR_READ_LENGTH,
ATEN_WDR_TIMEOUT);
- DPRINTK("ATEN2011_get_reg_sync offset is %x, return val %x\n", reg,
- *val);
+ dbg("%s: offset is %x, return val %x", __func__, reg, *val);
*val = (*val) & 0x00ff;
return ret;
}
-static int ATEN2011_set_Uart_Reg(struct usb_serial_port *port, __u16 reg,
- __u16 val)
+static int set_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 val)
{
-
struct usb_device *dev = port->serial->dev;
- struct ATENINTL_serial *ATEN2011_serial;
- int minor;
- ATEN2011_serial = ATEN2011_get_serial_private(port->serial);
+ struct ATENINTL_serial *a_serial;
+ __u16 minor;
+
+ a_serial = usb_get_serial_data(port->serial);
minor = port->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR)
minor = 0;
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;
- DPRINTK("ATEN2011_set_Uart_Reg application number is %x\n",
- val);
- } else {
- if (((__u16) port->number - (__u16) (minor)) == 0) {
- // val= 0x100;
- val |=
- (((__u16) port->number - (__u16) (minor)) + 1) << 8;
- DPRINTK
- ("ATEN2011_set_Uart_Reg application number is %x\n",
- val);
- } else {
- // val=0x300;
- val |=
- (((__u16) port->number - (__u16) (minor)) + 2) << 8;
- DPRINTK
- ("ATEN2011_set_Uart_Reg application number is %x\n",
- val);
- }
+ /*
+ * For the UART control registers,
+ * the application number need to be Or'ed
+ */
+ if (a_serial->ATEN2011_spectrum_2or4ports == 4)
+ val |= (((__u16)port->number - minor) + 1) << 8;
+ else {
+ if (((__u16) port->number - minor) == 0)
+ val |= (((__u16)port->number - minor) + 1) << 8;
+ else
+ val |= (((__u16)port->number - minor) + 2) << 8;
}
+ dbg("%s: application number is %x", __func__, val);
+
return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ATEN_WRREQ,
ATEN_WR_RTYPE, val, reg, NULL, 0,
ATEN_WDR_TIMEOUT);
-
}
-static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg,
- __u16 * val)
+static int get_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 *val)
{
struct usb_device *dev = port->serial->dev;
int ret = 0;
- __u16 Wval;
- struct ATENINTL_serial *ATEN2011_serial;
- int minor = port->serial->minor;
- ATEN2011_serial = ATEN2011_get_serial_private(port->serial);
+ __u16 wval;
+ struct ATENINTL_serial *a_serial;
+ __u16 minor = port->serial->minor;
+
+ a_serial = usb_get_serial_data(port->serial);
if (minor == SERIAL_TTY_NO_MINOR)
minor = 0;
- //DPRINTK("application number is %4x \n",(((__u16)port->number - (__u16)(minor))+1)<<8);
- /*Wval is same as application number */
- if (ATEN2011_serial->ATEN2011_spectrum_2or4ports == 4) {
- Wval = (((__u16) port->number - (__u16) (minor)) + 1) << 8;
- DPRINTK("ATEN2011_get_Uart_Reg application number is %x\n",
- Wval);
- } else {
- if (((__u16) port->number - (__u16) (minor)) == 0) {
- // Wval= 0x100;
- Wval =
- (((__u16) port->number - (__u16) (minor)) + 1) << 8;
- DPRINTK
- ("ATEN2011_get_Uart_Reg application number is %x\n",
- Wval);
- } else {
- // Wval=0x300;
- Wval =
- (((__u16) port->number - (__u16) (minor)) + 2) << 8;
- DPRINTK
- ("ATEN2011_get_Uart_Reg application number is %x\n",
- Wval);
- }
+ /* wval is same as application number */
+ if (a_serial->ATEN2011_spectrum_2or4ports == 4)
+ wval = (((__u16)port->number - minor) + 1) << 8;
+ else {
+ if (((__u16) port->number - minor) == 0)
+ wval = (((__u16) port->number - minor) + 1) << 8;
+ else
+ wval = (((__u16) port->number - minor) + 2) << 8;
}
+ dbg("%s: application number is %x", __func__, wval);
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), ATEN_RDREQ,
- ATEN_RD_RTYPE, Wval, reg, val, VENDOR_READ_LENGTH,
+ ATEN_RD_RTYPE, wval, reg, val, VENDOR_READ_LENGTH,
ATEN_WDR_TIMEOUT);
*val = (*val) & 0x00ff;
return ret;
}
-static void ATEN2011_Dump_serial_port(struct ATENINTL_port *ATEN2011_port)
-{
-
- DPRINTK("***************************************\n");
- DPRINTK("SpRegOffset is %2x\n", ATEN2011_port->SpRegOffset);
- DPRINTK("ControlRegOffset is %2x \n", ATEN2011_port->ControlRegOffset);
- DPRINTK("DCRRegOffset is %2x \n", ATEN2011_port->DcrRegOffset);
- DPRINTK("***************************************\n");
-
-}
-
static int handle_newMsr(struct ATENINTL_port *port, __u8 newMsr)
{
struct ATENINTL_port *ATEN2011_port;
icount = &ATEN2011_port->icount;
/* update input line counters */
- if (newMsr & ATEN_MSR_DELTA_CTS) {
+ if (newMsr & ATEN_MSR_DELTA_CTS)
icount->cts++;
- }
- if (newMsr & ATEN_MSR_DELTA_DSR) {
+ if (newMsr & ATEN_MSR_DELTA_DSR)
icount->dsr++;
- }
- if (newMsr & ATEN_MSR_DELTA_CD) {
+ if (newMsr & ATEN_MSR_DELTA_CD)
icount->dcd++;
- }
- if (newMsr & ATEN_MSR_DELTA_RI) {
+ if (newMsr & ATEN_MSR_DELTA_RI)
icount->rng++;
- }
}
return 0;
{
struct async_icount *icount;
- dbg("%s - %02x", __FUNCTION__, newLsr);
+ dbg("%s - %02x", __func__, newLsr);
if (newLsr & SERIAL_LSR_BI) {
- //
- // Parity and Framing errors only count if they
- // occur exclusive of a break being
- // received.
- //
+ /*
+ * Parity and Framing errors only count if they occur exclusive
+ * of a break being received.
+ */
newLsr &= (__u8) (SERIAL_LSR_OE | SERIAL_LSR_BI);
}
/* update input line counters */
icount = &port->icount;
- if (newLsr & SERIAL_LSR_BI) {
+ if (newLsr & SERIAL_LSR_BI)
icount->brk++;
- }
- if (newLsr & SERIAL_LSR_OE) {
+ if (newLsr & SERIAL_LSR_OE)
icount->overrun++;
- }
- if (newLsr & SERIAL_LSR_PE) {
+ if (newLsr & SERIAL_LSR_PE)
icount->parity++;
- }
- if (newLsr & SERIAL_LSR_FE) {
+ if (newLsr & SERIAL_LSR_FE)
icount->frame++;
- }
return 0;
}
struct ATENINTL_port *ATEN2011_port;
__u8 regval = 0x0;
- if (!urb) {
- DPRINTK("%s", "Invalid Pointer !!!!:\n");
- return;
- }
-
switch (urb->status) {
case 0:
/* success */
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
- dbg("%s - urb shutting down with status: %d", __FUNCTION__,
+ dbg("%s - urb shutting down with status: %d", __func__,
urb->status);
return;
default:
- dbg("%s - nonzero urb status received: %d", __FUNCTION__,
+ dbg("%s - nonzero urb status received: %d", __func__,
urb->status);
goto exit;
}
ATEN2011_port = (struct ATENINTL_port *)urb->context;
- DPRINTK("%s urb buffer size is %d\n", __FUNCTION__, urb->actual_length);
- DPRINTK("%s ATEN2011_port->MsrLsr is %d port %d\n", __FUNCTION__,
+ dbg("%s urb buffer size is %d", __func__, urb->actual_length);
+ dbg("%s ATEN2011_port->MsrLsr is %d port %d", __func__,
ATEN2011_port->MsrLsr, ATEN2011_port->port_num);
data = urb->transfer_buffer;
regval = (__u8) data[0];
- DPRINTK("%s data is %x\n", __FUNCTION__, regval);
+ dbg("%s data is %x", __func__, regval);
if (ATEN2011_port->MsrLsr == 0)
handle_newMsr(ATEN2011_port, regval);
else if (ATEN2011_port->MsrLsr == 1)
handle_newLsr(ATEN2011_port, regval);
- exit:
+exit:
return;
}
static int ATEN2011_get_reg(struct ATENINTL_port *ATEN, __u16 Wval, __u16 reg,
- __u16 * val)
+ __u16 *val)
{
struct usb_device *dev = ATEN->port->serial->dev;
struct usb_ctrlrequest *dr = NULL;
int ret = 0;
buffer = (__u8 *) ATEN->ctrl_buf;
-// dr=(struct usb_ctrlrequest *)(buffer);
dr = (void *)(buffer + 2);
dr->bRequestType = ATEN_RD_RTYPE;
dr->bRequest = ATEN_RDREQ;
- dr->wValue = cpu_to_le16(Wval); //0;
+ dr->wValue = cpu_to_le16(Wval);
dr->wIndex = cpu_to_le16(reg);
dr->wLength = cpu_to_le16(2);
int i;
__u16 wval;
int minor;
- //printk("in the function ATEN2011_interrupt_callback Length %d, Data %x \n",urb->actual_length,(unsigned int)urb->transfer_buffer);
- DPRINTK("%s", " : Entering\n");
+
+ dbg("%s", " : Entering");
ATEN2011_serial = (struct ATENINTL_serial *)urb->context;
- if (!urb) // || ATEN2011_serial->status_polling_started == 0 )
- {
- DPRINTK("%s", "Invalid Pointer !!!!:\n");
- return;
- }
switch (urb->status) {
case 0:
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
- dbg("%s - urb shutting down with status: %d", __FUNCTION__,
+ dbg("%s - urb shutting down with status: %d", __func__,
urb->status);
return;
default:
- dbg("%s - nonzero urb status received: %d", __FUNCTION__,
+ dbg("%s - nonzero urb status received: %d", __func__,
urb->status);
goto exit;
}
length = urb->actual_length;
data = urb->transfer_buffer;
- //ATEN2011_serial= (struct ATENINTL_serial *)urb->context;
- //serial = ATEN2011_get_usb_serial(port,__FUNCTION__);
serial = ATEN2011_serial->serial;
/* ATENINTL get 5 bytes
* Byte 5 FIFO status for both */
if (length && length > 5) {
- DPRINTK("%s \n", "Wrong data !!!");
+ dbg("%s", "Wrong data !!!");
return;
}
} else {
sp[0] = (__u8) data[0];
sp[1] = (__u8) data[2];
- //sp[2]=(__u8)data[2];
- //sp[3]=(__u8)data[3];
+ /* sp[2]=(__u8)data[2]; */
+ /* sp[3]=(__u8)data[3]; */
st = (__u8) data[4];
}
- // printk("%s data is sp1:%x sp2:%x sp3:%x sp4:%x status:%x\n",__FUNCTION__,sp1,sp2,sp3,sp4,st);
for (i = 0; i < serial->num_ports; i++) {
- ATEN2011_port = ATEN2011_get_port_private(serial->port[i]);
+ ATEN2011_port = usb_get_serial_port_data(serial->port[i]);
minor = serial->minor;
if (minor == SERIAL_TTY_NO_MINOR)
minor = 0;
(((__u16) serial->port[i]->number -
(__u16) (minor)) + 1) << 8;
if (ATEN2011_port->open != 0) {
- //printk("%s wval is:(for 2011) %x\n",__FUNCTION__,wval);
-
if (sp[i] & 0x01) {
- DPRINTK("SP%d No Interrupt !!!\n", i);
+ dbg("SP%d No Interrupt !!!", i);
} else {
switch (sp[i] & 0x0f) {
case SERIAL_IIR_RLS:
- DPRINTK
- ("Serial Port %d: Receiver status error or ",
- i);
- DPRINTK
- ("address bit detected in 9-bit mode\n");
+ dbg("Serial Port %d: Receiver status error or address bit detected in 9-bit mode", i);
ATEN2011_port->MsrLsr = 1;
ATEN2011_get_reg(ATEN2011_port, wval,
LINE_STATUS_REGISTER,
&Data);
break;
case SERIAL_IIR_MS:
- DPRINTK
- ("Serial Port %d: Modem status change\n",
- i);
+ dbg("Serial Port %d: Modem status change", i);
ATEN2011_port->MsrLsr = 0;
ATEN2011_get_reg(ATEN2011_port, wval,
MODEM_STATUS_REGISTER,
}
}
- exit:
+exit:
if (ATEN2011_serial->status_polling_started == 0)
return;
if (result) {
dev_err(&urb->dev->dev,
"%s - Error %d submitting interrupt urb\n",
- __FUNCTION__, result);
+ __func__, result);
}
return;
-
}
static void ATEN2011_bulk_in_callback(struct urb *urb)
struct ATENINTL_serial *ATEN2011_serial;
struct ATENINTL_port *ATEN2011_port;
struct tty_struct *tty;
- if (!urb) {
- DPRINTK("%s", "Invalid Pointer !!!!:\n");
- return;
- }
if (urb->status) {
- DPRINTK("nonzero read bulk status received: %d", urb->status);
-// if(urb->status==84)
- //ThreadState=1;
+ dbg("nonzero read bulk status received: %d", urb->status);
return;
}
ATEN2011_port = (struct ATENINTL_port *)urb->context;
- if (!ATEN2011_port) {
- DPRINTK("%s", "NULL ATEN2011_port pointer \n");
- return;
- }
port = (struct usb_serial_port *)ATEN2011_port->port;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return;
- }
-
- serial = ATEN2011_get_usb_serial(port, __FUNCTION__);
- if (!serial) {
- DPRINTK("%s\n", "Bad serial pointer ");
- return;
- }
+ serial = port->serial;
- DPRINTK("%s\n", "Entering... \n");
+ dbg("%s", "Entering...");
data = urb->transfer_buffer;
- ATEN2011_serial = ATEN2011_get_serial_private(serial);
-
- DPRINTK("%s", "Entering ........... \n");
+ ATEN2011_serial = usb_get_serial_data(serial);
if (urb->actual_length) {
tty = tty_port_tty_get(&ATEN2011_port->port->port);
if (tty) {
tty_buffer_request_room(tty, urb->actual_length);
tty_insert_flip_string(tty, data, urb->actual_length);
- DPRINTK(" %s \n", data);
tty_flip_buffer_push(tty);
tty_kref_put(tty);
}
ATEN2011_port->icount.rx += urb->actual_length;
- DPRINTK("ATEN2011_port->icount.rx is %d:\n",
+ dbg("ATEN2011_port->icount.rx is %d:",
ATEN2011_port->icount.rx);
-//MATRIX
}
if (!ATEN2011_port->read_urb) {
- DPRINTK("%s", "URB KILLED !!!\n");
+ dbg("%s", "URB KILLED !!!");
return;
}
ATEN2011_port->read_urb->dev = serial->dev;
status = usb_submit_urb(ATEN2011_port->read_urb, GFP_ATOMIC);
-
- if (status) {
- DPRINTK
- (" usb_submit_urb(read bulk) failed, status = %d",
- status);
- }
+ if (status)
+ dbg("usb_submit_urb(read bulk) failed, status = %d", status);
}
}
{
struct ATENINTL_port *ATEN2011_port;
struct tty_struct *tty;
- if (!urb) {
- DPRINTK("%s", "Invalid Pointer !!!!:\n");
- return;
- }
if (urb->status) {
- DPRINTK("nonzero write bulk status received:%d\n", urb->status);
+ dbg("nonzero write bulk status received:%d", urb->status);
return;
}
ATEN2011_port = (struct ATENINTL_port *)urb->context;
- if (!ATEN2011_port) {
- DPRINTK("%s", "NULL ATEN2011_port pointer \n");
- return;
- }
-
- if (ATEN2011_port_paranoia_check(ATEN2011_port->port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return;
- }
- DPRINTK("%s \n", "Entering .........");
+ dbg("%s", "Entering .........");
tty = tty_port_tty_get(&ATEN2011_port->port->port);
wake_up_interruptible(&tty->write_wait);
}
-//schedule_work(&ATEN2011_port->port->work);
+ /* schedule_work(&ATEN2011_port->port->work); */
tty_kref_put(tty);
}
int response;
int j;
struct usb_serial *serial;
-// struct usb_serial_port *port0;
struct urb *urb;
__u16 Data;
int status;
struct ktermios tmp_termios;
int minor;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return -ENODEV;
- }
- //ATEN2011_serial->NoOfOpenPorts++;
serial = port->serial;
- if (ATEN2011_serial_paranoia_check(serial, __FUNCTION__)) {
- DPRINTK("%s", "Serial Paranoia failed \n");
- return -ENODEV;
- }
-
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return -ENODEV;
-/*
- if (ATEN2011_port->ctrl_buf==NULL)
- {
- ATEN2011_port->ctrl_buf = kmalloc(16,GFP_KERNEL);
- if (ATEN2011_port->ctrl_buf == NULL) {
- printk(", Can't allocate ctrl buff\n");
- return -ENOMEM;
- }
-
- }
-
- if(!ATEN2011_port->control_urb)
- {
- ATEN2011_port->control_urb=kmalloc(sizeof(struct urb),GFP_KERNEL);
- }
-*/
-// port0 = serial->port[0];
-
- ATEN2011_serial = ATEN2011_get_serial_private(serial);
- if (ATEN2011_serial == NULL) //|| port0 == NULL)
- {
+ ATEN2011_serial = usb_get_serial_data(serial);
+ if (ATEN2011_serial == NULL)
return -ENODEV;
- }
- // increment the number of opened ports counter here
+
+ /* increment the number of opened ports counter here */
ATEN2011_serial->NoOfOpenPorts++;
- //printk("the num of ports opend is:%d\n",ATEN2011_serial->NoOfOpenPorts);
usb_clear_halt(serial->dev, port->write_urb->pipe);
usb_clear_halt(serial->dev, port->read_urb->pipe);
urb->transfer_buffer =
kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
if (!urb->transfer_buffer) {
- err("%s-out of memory for urb buffers.", __FUNCTION__);
+ err("%s-out of memory for urb buffers.", __func__);
continue;
}
}
* 0x08 : SP1/2 Control Reg
*****************************************************************************/
-//NEED to check the fallowing Block
+/* NEED to check the fallowing Block */
- status = 0;
Data = 0x0;
- status = ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
if (status < 0) {
- DPRINTK("Reading Spreg failed\n");
+ dbg("Reading Spreg failed");
return -1;
}
Data |= 0x80;
- status = ATEN2011_set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
+ status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
if (status < 0) {
- DPRINTK("writing Spreg failed\n");
+ dbg("writing Spreg failed");
return -1;
}
Data &= ~0x80;
- status = ATEN2011_set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
+ status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
if (status < 0) {
- DPRINTK("writing Spreg failed\n");
+ dbg("writing Spreg failed");
return -1;
}
-//End of block to be checked
-//**************************CHECK***************************//
+/* End of block to be checked */
+/**************************CHECK***************************/
if (RS485mode == 0)
Data = 0xC0;
else
Data = 0x00;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, SCRATCH_PAD_REGISTER, Data);
+ status = set_uart_reg(port, SCRATCH_PAD_REGISTER, Data);
if (status < 0) {
- DPRINTK("Writing SCRATCH_PAD_REGISTER failed status-0x%x\n",
- status);
+ dbg("Writing SCRATCH_PAD_REGISTER failed status-0x%x", status);
return -1;
} else
- DPRINTK("SCRATCH_PAD_REGISTER Writing success status%d\n",
- status);
+ dbg("SCRATCH_PAD_REGISTER Writing success status%d", status);
-//**************************CHECK***************************//
+/**************************CHECK***************************/
- status = 0;
Data = 0x0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
if (status < 0) {
- DPRINTK("Reading Controlreg failed\n");
+ dbg("Reading Controlreg failed");
return -1;
}
- Data |= 0x08; //Driver done bit
- /*
- status = ATEN2011_set_reg_sync(port,ATEN2011_port->ControlRegOffset,Data);
- if(status<0){
- DPRINTK("writing Controlreg failed\n");
- return -1;
- }
- */
- Data |= 0x20; //rx_disable
+ Data |= 0x08; /* Driver done bit */
+ Data |= 0x20; /* rx_disable */
status = 0;
status =
- ATEN2011_set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
+ set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
if (status < 0) {
- DPRINTK("writing Controlreg failed\n");
+ dbg("writing Controlreg failed");
return -1;
}
- //do register settings here
- // Set all regs to the device default values.
- ////////////////////////////////////
- // First Disable all interrupts.
- ////////////////////////////////////
+ /*
+ * do register settings here
+ * Set all regs to the device default values.
+ * First Disable all interrupts.
+ */
Data = 0x00;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
+ status = set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
if (status < 0) {
- DPRINTK("disableing interrupts failed\n");
+ dbg("disableing interrupts failed");
return -1;
}
- // Set FIFO_CONTROL_REGISTER to the default value
+ /* Set FIFO_CONTROL_REGISTER to the default value */
Data = 0x00;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data);
+ status = set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
if (status < 0) {
- DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n");
+ dbg("Writing FIFO_CONTROL_REGISTER failed");
return -1;
}
- Data = 0xcf; //chk
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data);
+ Data = 0xcf; /* chk */
+ status = set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
if (status < 0) {
- DPRINTK("Writing FIFO_CONTROL_REGISTER failed\n");
+ dbg("Writing FIFO_CONTROL_REGISTER failed");
return -1;
}
- Data = 0x03; //LCR_BITS_8
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ Data = 0x03; /* LCR_BITS_8 */
+ status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
ATEN2011_port->shadowLCR = Data;
- Data = 0x0b; // MCR_DTR|MCR_RTS|MCR_MASTER_IE
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ Data = 0x0b; /* MCR_DTR|MCR_RTS|MCR_MASTER_IE */
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
ATEN2011_port->shadowMCR = Data;
#ifdef Check
Data = 0x00;
- status = 0;
- status = ATEN2011_get_Uart_Reg(port, LINE_CONTROL_REGISTER, &Data);
+ status = get_uart_reg(port, LINE_CONTROL_REGISTER, &Data);
ATEN2011_port->shadowLCR = Data;
- Data |= SERIAL_LCR_DLAB; //data latch enable in LCR 0x80
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ Data |= SERIAL_LCR_DLAB; /* data latch enable in LCR 0x80 */
+ status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
Data = 0x0c;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_LSB, Data);
+ status = set_uart_reg(port, DIVISOR_LATCH_LSB, Data);
Data = 0x0;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_MSB, Data);
+ status = set_uart_reg(port, DIVISOR_LATCH_MSB, Data);
Data = 0x00;
- status = 0;
- status = ATEN2011_get_Uart_Reg(port, LINE_CONTROL_REGISTER, &Data);
+ status = get_uart_reg(port, LINE_CONTROL_REGISTER, &Data);
-// Data = ATEN2011_port->shadowLCR; //data latch disable
+/* Data = ATEN2011_port->shadowLCR; */ /* data latch disable */
Data = Data & ~SERIAL_LCR_DLAB;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ status = set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
ATEN2011_port->shadowLCR = Data;
#endif
- //clearing Bulkin and Bulkout Fifo
+ /* clearing Bulkin and Bulkout Fifo */
Data = 0x0;
- status = 0;
- status = ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
Data = Data | 0x0c;
- status = 0;
- status = ATEN2011_set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
+ status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
Data = Data & ~0x0c;
- status = 0;
- status = ATEN2011_set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
- //Finally enable all interrupts
+ status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
+ /* Finally enable all interrupts */
Data = 0x0;
Data = 0x0c;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
+ status = set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
- //clearing rx_disable
+ /* clearing rx_disable */
Data = 0x0;
- status = 0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
Data = Data & ~0x20;
- status = 0;
- status =
- ATEN2011_set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
+ status = set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
- // rx_negate
+ /* rx_negate */
Data = 0x0;
- status = 0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
Data = Data | 0x10;
status = 0;
- status =
- ATEN2011_set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
+ status = set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
/* force low_latency on so that our tty_push actually forces *
* the data through,otherwise it is scheduled, and with *
if (tty)
tty->low_latency = 1;
-/*
- printk("port number is %d \n",port->number);
- printk("serial number is %d \n",port->serial->minor);
- printk("Bulkin endpoint is %d \n",port->bulk_in_endpointAddress);
- printk("BulkOut endpoint is %d \n",port->bulk_out_endpointAddress);
- printk("Interrupt endpoint is %d \n",port->interrupt_in_endpointAddress);
- printk("port's number in the device is %d\n",ATEN2011_port->port_num);
-*/
-////////////////////////
-//#ifdef CheckStatusPipe
-/* Check to see if we've set up our endpoint info yet *
- * (can't set it up in ATEN2011_startup as the structures *
- * were not set up at that time.) */
+ /*
+ * Check to see if we've set up our endpoint info yet
+ * (can't set it up in ATEN2011_startup as the structures
+ * were not set up at that time.)
+ */
if (ATEN2011_serial->NoOfOpenPorts == 1) {
- // start the status polling here
+ /* start the status polling here */
ATEN2011_serial->status_polling_started = 1;
- //if (ATEN2011_serial->interrupt_in_buffer == NULL)
- // {
/* If not yet set, Set here */
ATEN2011_serial->interrupt_in_buffer =
serial->port[0]->interrupt_in_buffer;
ATEN2011_serial->interrupt_in_endpoint =
serial->port[0]->interrupt_in_endpointAddress;
- //printk(" interrupt endpoint:%d \n",ATEN2011_serial->interrupt_in_endpoint);
ATEN2011_serial->interrupt_read_urb =
serial->port[0]->interrupt_in_urb;
usb_submit_urb(ATEN2011_serial->interrupt_read_urb,
GFP_KERNEL);
if (response) {
- DPRINTK("%s - Error %d submitting interrupt urb",
- __FUNCTION__, response);
+ dbg("%s - Error %d submitting interrupt urb",
+ __func__, response);
}
- // else
- // printk(" interrupt URB submitted\n");
-
- //}
}
-//#endif
-///////////////////////
- /* see if we've set up our endpoint info yet *
- * (can't set it up in ATEN2011_startup as the *
- * structures were not set up at that time.) */
+ /*
+ * See if we've set up our endpoint info yet
+ * (can't set it up in ATEN2011_startup as the
+ * structures were not set up at that time.)
+ */
- DPRINTK("port number is %d \n", port->number);
- DPRINTK("serial number is %d \n", port->serial->minor);
- DPRINTK("Bulkin endpoint is %d \n", port->bulk_in_endpointAddress);
- DPRINTK("BulkOut endpoint is %d \n", port->bulk_out_endpointAddress);
- DPRINTK("Interrupt endpoint is %d \n",
+ dbg("port number is %d", port->number);
+ dbg("serial number is %d", port->serial->minor);
+ dbg("Bulkin endpoint is %d", port->bulk_in_endpointAddress);
+ dbg("BulkOut endpoint is %d", port->bulk_out_endpointAddress);
+ dbg("Interrupt endpoint is %d",
port->interrupt_in_endpointAddress);
- DPRINTK("port's number in the device is %d\n", ATEN2011_port->port_num);
+ dbg("port's number in the device is %d", ATEN2011_port->port_num);
ATEN2011_port->bulk_in_buffer = port->bulk_in_buffer;
ATEN2011_port->bulk_in_endpoint = port->bulk_in_endpointAddress;
ATEN2011_port->read_urb = port->read_urb;
transfer_buffer_length,
ATEN2011_bulk_in_callback, ATEN2011_port);
- DPRINTK("ATEN2011_open: bulkin endpoint is %d\n",
+ dbg("ATEN2011_open: bulkin endpoint is %d",
port->bulk_in_endpointAddress);
response = usb_submit_urb(ATEN2011_port->read_urb, GFP_KERNEL);
if (response) {
- err("%s - Error %d submitting control urb", __FUNCTION__,
+ err("%s - Error %d submitting control urb", __func__,
response);
}
ATEN2011_port->chaseResponsePending = 0;
/* send a open port command */
ATEN2011_port->open = 1;
- //ATEN2011_change_port_settings(ATEN2011_port,old_termios);
+ /* ATEN2011_change_port_settings(ATEN2011_port,old_termios); */
/* Setup termios */
ATEN2011_set_termios(tty, port, &tmp_termios);
ATEN2011_port->icount.tx = 0;
ATEN2011_port->icount.rx = 0;
- DPRINTK
- ("\n\nusb_serial serial:%x ATEN2011_port:%x\nATEN2011_serial:%x usb_serial_port port:%x\n\n",
+ dbg("usb_serial serial:%x ATEN2011_port:%x\nATEN2011_serial:%x usb_serial_port port:%x",
(unsigned int)serial, (unsigned int)ATEN2011_port,
(unsigned int)ATEN2011_serial, (unsigned int)port);
int chars = 0;
struct ATENINTL_port *ATEN2011_port;
- //DPRINTK("%s \n"," ATEN2011_chars_in_buffer:entering ...........");
-
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return -1;
- }
+ /* dbg("%s"," ATEN2011_chars_in_buffer:entering ..........."); */
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) {
- DPRINTK("%s \n", "ATEN2011_break:leaving ...........");
+ dbg("%s", "ATEN2011_break:leaving ...........");
return -1;
}
- for (i = 0; i < NUM_URBS; ++i) {
- if (ATEN2011_port->write_urb_pool[i]->status == -EINPROGRESS) {
+ for (i = 0; i < NUM_URBS; ++i)
+ if (ATEN2011_port->write_urb_pool[i]->status == -EINPROGRESS)
chars += URB_TRANSFER_BUFFER_SIZE;
- }
- }
- dbg("%s - returns %d", __FUNCTION__, chars);
- return (chars);
+
+ dbg("%s - returns %d", __func__, chars);
+ return chars;
}
int count;
while (1) {
-
count = ATEN2011_chars_in_buffer(tty);
/* Check for Buffer status */
- if (count <= 0) {
+ if (count <= 0)
return;
- }
/* Block the thread for a while */
interruptible_sleep_on_timeout(&ATEN2011_port->wait_chase,
/* No activity.. count down section */
wait--;
if (wait == 0) {
- dbg("%s - TIMEOUT", __FUNCTION__);
+ dbg("%s - TIMEOUT", __func__);
return;
} else {
/* Reset timout value back to seconds */
struct ATENINTL_port *ATEN2011_port;
int no_urbs;
__u16 Data;
- //__u16 Data1= 20;
-
- DPRINTK("%s\n", "ATEN2011_close:entering...");
- /* MATRIX */
- //ThreadState = 1;
- /* MATRIX */
- //printk("Entering... :ATEN2011_close\n");
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return;
- }
- serial = ATEN2011_get_usb_serial(port, __FUNCTION__);
- if (!serial) {
- DPRINTK("%s", "Serial Paranoia failed \n");
- return;
- }
- // take the Adpater and port's private data
- ATEN2011_serial = ATEN2011_get_serial_private(serial);
- ATEN2011_port = ATEN2011_get_port_private(port);
- if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) {
+
+ dbg("%s", "ATEN2011_close:entering...");
+ serial = port->serial;
+
+ /* take the Adpater and port's private data */
+ ATEN2011_serial = usb_get_serial_data(serial);
+ ATEN2011_port = usb_get_serial_port_data(port);
+ if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL))
return;
- }
+
if (serial->dev) {
/* flush and block(wait) until tx is empty */
ATEN2011_block_until_tx_empty(tty, ATEN2011_port);
}
- // kill the ports URB's
+ /* kill the ports URB's */
for (no_urbs = 0; no_urbs < NUM_URBS; no_urbs++)
usb_kill_urb(ATEN2011_port->write_urb_pool[no_urbs]);
/* Freeing Write URBs */
for (no_urbs = 0; no_urbs < NUM_URBS; ++no_urbs) {
- if (ATEN2011_port->write_urb_pool[no_urbs]) {
- if (ATEN2011_port->write_urb_pool[no_urbs]->
- transfer_buffer)
- kfree(ATEN2011_port->write_urb_pool[no_urbs]->
- transfer_buffer);
- usb_free_urb(ATEN2011_port->write_urb_pool[no_urbs]);
- }
+ kfree(ATEN2011_port->write_urb_pool[no_urbs]->transfer_buffer);
+ usb_free_urb(ATEN2011_port->write_urb_pool[no_urbs]);
}
/* While closing port, shutdown all bulk read, write *
* and interrupt read if they exists */
if (serial->dev) {
if (ATEN2011_port->write_urb) {
- DPRINTK("%s", "Shutdown bulk write\n");
+ dbg("%s", "Shutdown bulk write");
usb_kill_urb(ATEN2011_port->write_urb);
}
if (ATEN2011_port->read_urb) {
- DPRINTK("%s", "Shutdown bulk read\n");
+ dbg("%s", "Shutdown bulk read");
usb_kill_urb(ATEN2011_port->read_urb);
}
if ((&ATEN2011_port->control_urb)) {
- DPRINTK("%s", "Shutdown control read\n");
- // usb_kill_urb (ATEN2011_port->control_urb);
+ dbg("%s", "Shutdown control read");
+ /* usb_kill_urb (ATEN2011_port->control_urb); */
}
}
- //if(ATEN2011_port->ctrl_buf != NULL)
- //kfree(ATEN2011_port->ctrl_buf);
- // decrement the no.of open ports counter of an individual USB-serial adapter.
+ /* if(ATEN2011_port->ctrl_buf != NULL) */
+ /* kfree(ATEN2011_port->ctrl_buf); */
+ /* decrement the no.of open ports counter of an individual USB-serial adapter. */
ATEN2011_serial->NoOfOpenPorts--;
- DPRINTK("NoOfOpenPorts in close%d:in port%d\n",
+ dbg("NoOfOpenPorts in close%d:in port%d",
ATEN2011_serial->NoOfOpenPorts, port->number);
- //printk("the num of ports opend is:%d\n",ATEN2011_serial->NoOfOpenPorts);
if (ATEN2011_serial->NoOfOpenPorts == 0) {
- //stop the stus polling here
- //printk("disabling the status polling flag to 0 :\n");
+ /* stop the stus polling here */
ATEN2011_serial->status_polling_started = 0;
if (ATEN2011_serial->interrupt_read_urb) {
- DPRINTK("%s", "Shutdown interrupt_read_urb\n");
- //ATEN2011_serial->interrupt_in_buffer=NULL;
- //usb_kill_urb (ATEN2011_serial->interrupt_read_urb);
+ dbg("%s", "Shutdown interrupt_read_urb");
+ /* ATEN2011_serial->interrupt_in_buffer=NULL; */
+ /* usb_kill_urb (ATEN2011_serial->interrupt_read_urb); */
}
}
if (ATEN2011_port->write_urb) {
/* if this urb had a transfer buffer already (old tx) free it */
- if (ATEN2011_port->write_urb->transfer_buffer != NULL) {
- kfree(ATEN2011_port->write_urb->transfer_buffer);
- }
+ kfree(ATEN2011_port->write_urb->transfer_buffer);
usb_free_urb(ATEN2011_port->write_urb);
}
- // clear the MCR & IER
+
+ /* clear the MCR & IER */
Data = 0x00;
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
Data = 0x00;
- ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
-
- //ATEN2011_get_Uart_Reg(port,MODEM_CONTROL_REGISTER,&Data1);
- //printk("value of MCR after closing the port is : 0x%x\n",Data1);
+ set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
ATEN2011_port->open = 0;
- DPRINTK("%s \n", "Leaving ............");
+ dbg("%s", "Leaving ............");
}
/* No activity.. count down section */
wait--;
if (wait == 0) {
- dbg("%s - TIMEOUT", __FUNCTION__);
+ dbg("%s - TIMEOUT", __func__);
return;
} else {
/* Reset timout value back to seconds */
struct ATENINTL_serial *ATEN2011_serial;
struct ATENINTL_port *ATEN2011_port;
- DPRINTK("%s \n", "Entering ...........");
- DPRINTK("ATEN2011_break: Start\n");
+ dbg("%s", "Entering ...........");
+ dbg("ATEN2011_break: Start");
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return;
- }
-
- serial = ATEN2011_get_usb_serial(port, __FUNCTION__);
- if (!serial) {
- DPRINTK("%s", "Serial Paranoia failed \n");
- return;
- }
+ serial = port->serial;
- ATEN2011_serial = ATEN2011_get_serial_private(serial);
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_serial = usb_get_serial_data(serial);
+ ATEN2011_port = usb_get_serial_port_data(port);
- if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) {
+ if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL))
return;
- }
/* flush and chase */
ATEN2011_port->chaseResponsePending = 1;
if (serial->dev) {
-
/* flush and block until tx is empty */
ATEN2011_block_until_chase_response(tty, ATEN2011_port);
}
- if (break_state == -1) {
+ if (break_state == -1)
data = ATEN2011_port->shadowLCR | LCR_SET_BREAK;
- } else {
+ else
data = ATEN2011_port->shadowLCR & ~LCR_SET_BREAK;
- }
ATEN2011_port->shadowLCR = data;
- DPRINTK("ATEN2011_break ATEN2011_port->shadowLCR is %x\n",
+ dbg("ATEN2011_break ATEN2011_port->shadowLCR is %x",
ATEN2011_port->shadowLCR);
- ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER,
- ATEN2011_port->shadowLCR);
+ set_uart_reg(port, LINE_CONTROL_REGISTER, ATEN2011_port->shadowLCR);
return;
}
int room = 0;
struct ATENINTL_port *ATEN2011_port;
-// DPRINTK("%s \n"," ATEN2011_write_room:entering ...........");
-
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- DPRINTK("%s \n", " ATEN2011_write_room:leaving ...........");
- return -1;
- }
-
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) {
- DPRINTK("%s \n", "ATEN2011_break:leaving ...........");
+ dbg("%s", "ATEN2011_break:leaving ...........");
return -1;
}
- for (i = 0; i < NUM_URBS; ++i) {
- if (ATEN2011_port->write_urb_pool[i]->status != -EINPROGRESS) {
+ for (i = 0; i < NUM_URBS; ++i)
+ if (ATEN2011_port->write_urb_pool[i]->status != -EINPROGRESS)
room += URB_TRANSFER_BUFFER_SIZE;
- }
- }
- dbg("%s - returns %d", __FUNCTION__, room);
- return (room);
+ dbg("%s - returns %d", __func__, room);
+ return room;
}
struct usb_serial *serial;
struct ATENINTL_serial *ATEN2011_serial;
struct urb *urb;
- //__u16 Data;
const unsigned char *current_position = data;
unsigned char *data1;
- DPRINTK("%s \n", "entering ...........");
-
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Port Paranoia failed \n");
- return -1;
- }
+ dbg("%s", "entering ...........");
serial = port->serial;
- if (ATEN2011_serial_paranoia_check(serial, __FUNCTION__)) {
- DPRINTK("%s", "Serial Paranoia failed \n");
- return -1;
- }
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) {
- DPRINTK("%s", "ATEN2011_port is NULL\n");
+ dbg("%s", "ATEN2011_port is NULL");
return -1;
}
- ATEN2011_serial = ATEN2011_get_serial_private(serial);
+ ATEN2011_serial = usb_get_serial_data(serial);
if (ATEN2011_serial == NULL) {
- DPRINTK("%s", "ATEN2011_serial is NULL \n");
+ dbg("%s", "ATEN2011_serial is NULL");
return -1;
}
for (i = 0; i < NUM_URBS; ++i) {
if (ATEN2011_port->write_urb_pool[i]->status != -EINPROGRESS) {
urb = ATEN2011_port->write_urb_pool[i];
- DPRINTK("\nURB:%d", i);
+ dbg("URB:%d", i);
break;
}
}
if (urb == NULL) {
- dbg("%s - no more free urbs", __FUNCTION__);
+ dbg("%s - no more free urbs", __func__);
goto exit;
}
kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
if (urb->transfer_buffer == NULL) {
- err("%s no more kernel memory...", __FUNCTION__);
+ err("%s no more kernel memory...", __func__);
goto exit;
}
}
transfer_size = min(count, URB_TRANSFER_BUFFER_SIZE);
memcpy(urb->transfer_buffer, current_position, transfer_size);
- //usb_serial_debug_data (__FILE__, __FUNCTION__, transfer_size, urb->transfer_buffer);
+ /* usb_serial_debug_data (__FILE__, __func__, transfer_size, urb->transfer_buffer); */
/* fill urb with data and submit */
minor = port->serial->minor;
- if (minor == SERIAL_TTY_NO_MINOR) ;
- minor = 0;
+ if (minor == SERIAL_TTY_NO_MINOR)
+ minor = 0;
if ((ATEN2011_serial->ATEN2011_spectrum_2or4ports == 2)
&& (((__u16) port->number - (__u16) (minor)) != 0)) {
usb_fill_bulk_urb(urb, ATEN2011_serial->serial->dev,
ATEN2011_port);
data1 = urb->transfer_buffer;
- DPRINTK("\nbulkout endpoint is %d", port->bulk_out_endpointAddress);
- //for(i=0;i < urb->actual_length;i++)
- // DPRINTK("Data is %c\n ",data1[i]);
+ dbg("bulkout endpoint is %d", port->bulk_out_endpointAddress);
+ /* for(i=0;i < urb->actual_length;i++) */
+ /* dbg("Data is %c ",data1[i]); */
/* send it down the pipe */
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) {
err("%s - usb_submit_urb(write bulk) failed with status = %d",
- __FUNCTION__, status);
+ __func__, status);
bytes_sent = status;
goto exit;
}
bytes_sent = transfer_size;
ATEN2011_port->icount.tx += transfer_size;
- DPRINTK("ATEN2011_port->icount.tx is %d:\n", ATEN2011_port->icount.tx);
- exit:
+ dbg("ATEN2011_port->icount.tx is %d:", ATEN2011_port->icount.tx);
+exit:
return bytes_sent;
-
}
static void ATEN2011_throttle(struct tty_struct *tty)
struct ATENINTL_port *ATEN2011_port;
int status;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return;
- }
+ dbg("- port %d", port->number);
- DPRINTK("- port %d\n", port->number);
-
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return;
if (!ATEN2011_port->open) {
- DPRINTK("%s\n", "port not opened");
+ dbg("%s", "port not opened");
return;
}
- DPRINTK("%s", "Entering .......... \n");
+ dbg("%s", "Entering .......... ");
if (!tty) {
- dbg("%s - no tty available", __FUNCTION__);
+ dbg("%s - no tty available", __func__);
return;
}
/* if we are implementing XON/XOFF, send the stop character */
if (I_IXOFF(tty)) {
unsigned char stop_char = STOP_CHAR(tty);
- status = ATEN2011_write(tty, port, &stop_char, 1); //FC4
- if (status <= 0) {
+ status = ATEN2011_write(tty, port, &stop_char, 1);
+ if (status <= 0)
return;
- }
}
/* if we are implementing RTS/CTS, toggle that line */
if (tty->termios->c_cflag & CRTSCTS) {
ATEN2011_port->shadowMCR &= ~MCR_RTS;
- status = 0;
- status =
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER,
- ATEN2011_port->shadowMCR);
-
- if (status < 0) {
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER,
+ ATEN2011_port->shadowMCR);
+ if (status < 0)
return;
- }
}
return;
{
struct usb_serial_port *port = tty->driver_data;
int status;
- struct ATENINTL_port *ATEN2011_port = ATEN2011_get_port_private(port);
-
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return;
- }
+ struct ATENINTL_port *ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return;
if (!ATEN2011_port->open) {
- dbg("%s - port not opened", __FUNCTION__);
+ dbg("%s - port not opened", __func__);
return;
}
- DPRINTK("%s", "Entering .......... \n");
+ dbg("%s", "Entering .......... ");
if (!tty) {
- dbg("%s - no tty available", __FUNCTION__);
+ dbg("%s - no tty available", __func__);
return;
}
/* if we are implementing XON/XOFF, send the start character */
if (I_IXOFF(tty)) {
unsigned char start_char = START_CHAR(tty);
- status = ATEN2011_write(tty, port, &start_char, 1); //FC4
- if (status <= 0) {
+ status = ATEN2011_write(tty, port, &start_char, 1);
+ if (status <= 0)
return;
- }
}
/* if we are implementing RTS/CTS, toggle that line */
if (tty->termios->c_cflag & CRTSCTS) {
ATEN2011_port->shadowMCR |= MCR_RTS;
- status = 0;
- status =
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER,
- ATEN2011_port->shadowMCR);
- if (status < 0) {
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER,
+ ATEN2011_port->shadowMCR);
+ if (status < 0)
return;
- }
}
return;
static int ATEN2011_tiocmget(struct tty_struct *tty, struct file *file)
{
struct usb_serial_port *port = tty->driver_data;
- //struct ti_port *tport = usb_get_serial_port_data(port);
struct ATENINTL_port *ATEN2011_port;
unsigned int result;
__u16 msr;
__u16 mcr;
- //unsigned int mcr;
+ /* unsigned int mcr; */
int status = 0;
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
- DPRINTK("%s - port %d", __FUNCTION__, port->number);
+ dbg("%s - port %d", __func__, port->number);
if (ATEN2011_port == NULL)
return -ENODEV;
- status = ATEN2011_get_Uart_Reg(port, MODEM_STATUS_REGISTER, &msr);
- status = ATEN2011_get_Uart_Reg(port, MODEM_CONTROL_REGISTER, &mcr);
-// mcr = ATEN2011_port->shadowMCR;
-// COMMENT2: the Fallowing three line are commented for updating only MSR values
+ status = get_uart_reg(port, MODEM_STATUS_REGISTER, &msr);
+ status = get_uart_reg(port, MODEM_CONTROL_REGISTER, &mcr);
+ /* mcr = ATEN2011_port->shadowMCR; */
+ /* COMMENT2: the Fallowing three line are commented for updating only MSR values */
result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0)
| ((mcr & MCR_RTS) ? TIOCM_RTS : 0)
| ((mcr & MCR_LOOPBACK) ? TIOCM_LOOP : 0)
| ((msr & ATEN2011_MSR_RI) ? TIOCM_RI : 0)
| ((msr & ATEN2011_MSR_DSR) ? TIOCM_DSR : 0);
- DPRINTK("%s - 0x%04X", __FUNCTION__, result);
+ dbg("%s - 0x%04X", __func__, result);
return result;
}
{
struct usb_serial_port *port = tty->driver_data;
struct ATENINTL_port *ATEN2011_port;
- //struct ti_port *tport = usb_get_serial_port_data(port);
unsigned int mcr;
unsigned int status;
- DPRINTK("%s - port %d", __FUNCTION__, port->number);
+ dbg("%s - port %d", __func__, port->number);
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return -ENODEV;
ATEN2011_port->shadowMCR = mcr;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, mcr);
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER, mcr);
if (status < 0) {
- DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n");
+ dbg("setting MODEM_CONTROL_REGISTER Failed");
return -1;
}
struct usb_serial *serial;
struct ATENINTL_port *ATEN2011_port;
- DPRINTK("ATEN2011_set_termios: START\n");
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return;
- }
+ dbg("ATEN2011_set_termios: START");
serial = port->serial;
- if (ATEN2011_serial_paranoia_check(serial, __FUNCTION__)) {
- DPRINTK("%s", "Invalid Serial \n");
- return;
- }
-
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return;
if (!ATEN2011_port->open) {
- dbg("%s - port not opened", __FUNCTION__);
+ dbg("%s - port not opened", __func__);
return;
}
- DPRINTK("%s\n", "setting termios - ");
+ dbg("%s", "setting termios - ");
cflag = tty->termios->c_cflag;
if (!cflag) {
- DPRINTK("%s %s\n", __FUNCTION__, "cflag is NULL");
+ dbg("%s %s", __func__, "cflag is NULL");
return;
}
if ((cflag == old_termios->c_cflag) &&
(RELEVANT_IFLAG(tty->termios->c_iflag) ==
RELEVANT_IFLAG(old_termios->c_iflag))) {
- DPRINTK("%s\n", "Nothing to change");
+ dbg("%s", "Nothing to change");
return;
}
}
- dbg("%s - clfag %08x iflag %08x", __FUNCTION__,
+ dbg("%s - clfag %08x iflag %08x", __func__,
tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
if (old_termios) {
- dbg("%s - old clfag %08x old iflag %08x", __FUNCTION__,
+ dbg("%s - old clfag %08x old iflag %08x", __func__,
old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
}
- dbg("%s - port %d", __FUNCTION__, port->number);
+ dbg("%s - port %d", __func__, port->number);
/* change the port settings to the new ones specified */
ATEN2011_change_port_settings(tty, ATEN2011_port, old_termios);
if (!ATEN2011_port->read_urb) {
- DPRINTK("%s", "URB KILLED !!!!!\n");
+ dbg("%s", "URB KILLED !!!!!");
return;
}
ATEN2011_port->read_urb->dev = serial->dev;
status = usb_submit_urb(ATEN2011_port->read_urb, GFP_ATOMIC);
if (status) {
- DPRINTK
+ dbg
(" usb_submit_urb(read bulk) failed, status = %d",
status);
}
count = ATEN2011_chars_in_buffer(tty);
if (count == 0) {
- dbg("%s -- Empty", __FUNCTION__);
+ dbg("%s -- Empty", __func__);
result = TIOCSER_TEMT;
}
result = tty->read_cnt;
- dbg("%s(%d) = %d", __FUNCTION__, ATEN2011_port->port->number, result);
+ dbg("%s(%d) = %d", __func__, ATEN2011_port->port->number, result);
if (copy_to_user(value, &result, sizeof(int)))
return -EFAULT;
return -1;
port = (struct usb_serial_port *)ATEN2011_port->port;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return -1;
- }
mcr = ATEN2011_port->shadowMCR;
ATEN2011_port->shadowMCR = mcr;
Data = ATEN2011_port->shadowMCR;
- status = 0;
- status = ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) {
- DPRINTK("setting MODEM_CONTROL_REGISTER Failed\n");
+ dbg("setting MODEM_CONTROL_REGISTER Failed");
return -1;
}
unsigned int result = 0;
__u16 msr;
unsigned int mcr = ATEN2011_port->shadowMCR;
- int status = 0;
- status =
- ATEN2011_get_Uart_Reg(ATEN2011_port->port, MODEM_STATUS_REGISTER,
- &msr);
+ int status;
+
+ status = get_uart_reg(ATEN2011_port->port, MODEM_STATUS_REGISTER, &msr);
result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0) /* 0x002 */
|((mcr & MCR_RTS) ? TIOCM_RTS : 0) /* 0x004 */
|((msr & ATEN2011_MSR_CTS) ? TIOCM_CTS : 0) /* 0x020 */
|((msr & ATEN2011_MSR_RI) ? TIOCM_RI : 0) /* 0x080 */
|((msr & ATEN2011_MSR_DSR) ? TIOCM_DSR : 0); /* 0x100 */
- dbg("%s -- %x", __FUNCTION__, result);
+ dbg("%s -- %x", __func__, result);
if (copy_to_user(value, &result, sizeof(int)))
return -EFAULT;
int ATENret = 0;
unsigned int __user *user_arg = (unsigned int __user *)arg;
- //printk("%s - port %d, cmd = 0x%x\n", __FUNCTION__, port->number, cmd);
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return -1;
- }
-
- ATEN2011_port = ATEN2011_get_port_private(port);
+ ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL)
return -1;
- dbg("%s - port %d, cmd = 0x%x", __FUNCTION__, port->number, cmd);
+ dbg("%s - port %d, cmd = 0x%x", __func__, port->number, cmd);
switch (cmd) {
/* return number of bytes available */
case TIOCINQ:
- dbg("%s (%d) TIOCINQ", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCINQ", __func__, port->number);
return get_number_bytes_avail(tty, ATEN2011_port, user_arg);
break;
case TIOCOUTQ:
- dbg("%s (%d) TIOCOUTQ", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCOUTQ", __func__, port->number);
return put_user(ATEN2011_chars_in_buffer(tty), user_arg);
break;
case TIOCSERGETLSR:
- dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCSERGETLSR", __func__, port->number);
return get_lsr_info(tty, ATEN2011_port, user_arg);
return 0;
case TIOCMBIS:
case TIOCMBIC:
case TIOCMSET:
- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__,
+ dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __func__,
port->number);
- // printk("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number);
- ATENret =
- set_modem_info(ATEN2011_port, cmd, user_arg);
- // printk(" %s: ret:%d\n",__FUNCTION__,ATENret);
+ ATENret = set_modem_info(ATEN2011_port, cmd, user_arg);
return ATENret;
case TIOCMGET:
- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCMGET", __func__, port->number);
return get_modem_info(ATEN2011_port, user_arg);
case TIOCGSERIAL:
- dbg("%s (%d) TIOCGSERIAL", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCGSERIAL", __func__, port->number);
return get_serial_info(ATEN2011_port,
(struct serial_struct __user *)arg);
case TIOCSSERIAL:
- dbg("%s (%d) TIOCSSERIAL", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCSSERIAL", __func__, port->number);
break;
case TIOCMIWAIT:
- dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number);
+ dbg("%s (%d) TIOCMIWAIT", __func__, port->number);
cprev = ATEN2011_port->icount;
while (1) {
/* see if a signal did it */
icount.brk = cnow.brk;
icount.buf_overrun = cnow.buf_overrun;
- dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d", __FUNCTION__,
+ dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d", __func__,
port->number, icount.rx, icount.tx);
if (copy_to_user((void __user *)arg, &icount, sizeof(icount)))
return -EFAULT;
}
static int ATEN2011_calc_baud_rate_divisor(int baudRate, int *divisor,
- __u16 * clk_sel_val)
+ __u16 *clk_sel_val)
{
- //int i;
- //__u16 custom,round1, round;
-
- dbg("%s - %d", __FUNCTION__, baudRate);
+ dbg("%s - %d", __func__, baudRate);
if (baudRate <= 115200) {
*divisor = 115200 / baudRate;
return -1;
port = (struct usb_serial_port *)ATEN2011_port->port;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return -1;
- }
- if (ATEN2011_serial_paranoia_check(port->serial, __FUNCTION__)) {
- DPRINTK("%s", "Invalid Serial \n");
- return -1;
- }
-
- DPRINTK("%s", "Entering .......... \n");
+ dbg("%s", "Entering .......... ");
minor = ATEN2011_port->port->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR)
minor = 0;
number = ATEN2011_port->port->number - minor;
- dbg("%s - port = %d, baud = %d", __FUNCTION__,
+ dbg("%s - port = %d, baud = %d", __func__,
ATEN2011_port->port->number, baudRate);
- //reset clk_uart_sel in spregOffset
+ /* reset clk_uart_sel in spregOffset */
if (baudRate > 115200) {
#ifdef HW_flow_control
- //NOTE: need to see the pther register to modify
- //setting h/w flow control bit to 1;
- status = 0;
- //Data = ATEN2011_port->shadowMCR ;
+ /*
+ * NOTE: need to see the pther register to modify
+ * setting h/w flow control bit to 1;
+ */
+ /* Data = ATEN2011_port->shadowMCR; */
Data = 0x2b;
ATEN2011_port->shadowMCR = Data;
- status =
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) {
- DPRINTK("Writing spreg failed in set_serial_baud\n");
+ dbg("Writing spreg failed in set_serial_baud");
return -1;
}
#endif
} else {
#ifdef HW_flow_control
- //setting h/w flow control bit to 0;
- status = 0;
- //Data = ATEN2011_port->shadowMCR ;
+ /* setting h/w flow control bit to 0; */
+ /* Data = ATEN2011_port->shadowMCR; */
Data = 0xb;
ATEN2011_port->shadowMCR = Data;
- status =
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ status = set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
if (status < 0) {
- DPRINTK("Writing spreg failed in set_serial_baud\n");
+ dbg("Writing spreg failed in set_serial_baud");
return -1;
}
#endif
}
- if (1) //baudRate <= 115200)
- {
+ if (1) /* baudRate <= 115200) */ {
clk_sel_val = 0x0;
Data = 0x0;
- status = 0;
status =
ATEN2011_calc_baud_rate_divisor(baudRate, &divisor,
&clk_sel_val);
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset,
- &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
if (status < 0) {
- DPRINTK("reading spreg failed in set_serial_baud\n");
+ dbg("reading spreg failed in set_serial_baud");
return -1;
}
Data = (Data & 0x8f) | clk_sel_val;
- status = 0;
- status =
- ATEN2011_set_reg_sync(port, ATEN2011_port->SpRegOffset,
- Data);
+ status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
if (status < 0) {
- DPRINTK("Writing spreg failed in set_serial_baud\n");
+ dbg("Writing spreg failed in set_serial_baud");
return -1;
}
/* Calculate the Divisor */
if (status) {
- err("%s - bad baud rate", __FUNCTION__);
- DPRINTK("%s\n", "bad baud rate");
+ err("%s - bad baud rate", __func__);
+ dbg("%s", "bad baud rate");
return status;
}
/* Enable access to divisor latch */
Data = ATEN2011_port->shadowLCR | SERIAL_LCR_DLAB;
ATEN2011_port->shadowLCR = Data;
- ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
/* Write the divisor */
Data = (unsigned char)(divisor & 0xff);
- DPRINTK("set_serial_baud Value to write DLL is %x\n", Data);
- ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_LSB, Data);
+ dbg("set_serial_baud Value to write DLL is %x", Data);
+ set_uart_reg(port, DIVISOR_LATCH_LSB, Data);
Data = (unsigned char)((divisor & 0xff00) >> 8);
- DPRINTK("set_serial_baud Value to write DLM is %x\n", Data);
- ATEN2011_set_Uart_Reg(port, DIVISOR_LATCH_MSB, Data);
+ dbg("set_serial_baud Value to write DLM is %x", Data);
+ set_uart_reg(port, DIVISOR_LATCH_MSB, Data);
/* Disable access to divisor latch */
Data = ATEN2011_port->shadowLCR & ~SERIAL_LCR_DLAB;
ATEN2011_port->shadowLCR = Data;
- ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
}
port = (struct usb_serial_port *)ATEN2011_port->port;
- if (ATEN2011_port_paranoia_check(port, __FUNCTION__)) {
- DPRINTK("%s", "Invalid port \n");
- return;
- }
-
- if (ATEN2011_serial_paranoia_check(port->serial, __FUNCTION__)) {
- DPRINTK("%s", "Invalid Serial \n");
- return;
- }
-
serial = port->serial;
- dbg("%s - port %d", __FUNCTION__, ATEN2011_port->port->number);
+ dbg("%s - port %d", __func__, ATEN2011_port->port->number);
if (!ATEN2011_port->open) {
- dbg("%s - port not opened", __FUNCTION__);
+ dbg("%s - port not opened", __func__);
return;
}
if ((!tty) || (!tty->termios)) {
- dbg("%s - no tty structures", __FUNCTION__);
+ dbg("%s - no tty structures", __func__);
return;
}
- DPRINTK("%s", "Entering .......... \n");
+ dbg("%s", "Entering .......... ");
lData = LCR_BITS_8;
lStop = LCR_STOP_1;
/* Change the number of bits */
-//COMMENT1: the below Line"if(cflag & CSIZE)" is added for the errors we get for serial loop data test i.e serial_loopback.pl -v
- //if(cflag & CSIZE)
+ /* COMMENT1: the below Line"if(cflag & CSIZE)" is added for the errors we get for serial loop data test i.e serial_loopback.pl -v */
+ /* if(cflag & CSIZE) */
{
switch (cflag & CSIZE) {
case CS5:
if (cflag & PARENB) {
if (cflag & PARODD) {
lParity = LCR_PAR_ODD;
- dbg("%s - parity = odd", __FUNCTION__);
+ dbg("%s - parity = odd", __func__);
} else {
lParity = LCR_PAR_EVEN;
- dbg("%s - parity = even", __FUNCTION__);
+ dbg("%s - parity = even", __func__);
}
} else {
- dbg("%s - parity = none", __FUNCTION__);
+ dbg("%s - parity = none", __func__);
}
- if (cflag & CMSPAR) {
+ if (cflag & CMSPAR)
lParity = lParity | 0x20;
- }
/* Change the Stop bit */
if (cflag & CSTOPB) {
lStop = LCR_STOP_2;
- dbg("%s - stop bits = 2", __FUNCTION__);
+ dbg("%s - stop bits = 2", __func__);
} else {
lStop = LCR_STOP_1;
- dbg("%s - stop bits = 1", __FUNCTION__);
+ dbg("%s - stop bits = 1", __func__);
}
/* Update the LCR with the correct value */
~(LCR_BITS_MASK | LCR_STOP_MASK | LCR_PAR_MASK);
ATEN2011_port->shadowLCR |= (lData | lParity | lStop);
- DPRINTK
- ("ATEN2011_change_port_settings ATEN2011_port->shadowLCR is %x\n",
+ dbg
+ ("ATEN2011_change_port_settings ATEN2011_port->shadowLCR is %x",
ATEN2011_port->shadowLCR);
/* Disable Interrupts */
Data = 0x00;
- ATEN2011_set_Uart_Reg(port, INTERRUPT_ENABLE_REGISTER, Data);
+ set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
Data = 0x00;
- ATEN2011_set_Uart_Reg(port, FIFO_CONTROL_REGISTER, Data);
+ set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
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 */
Data = ATEN2011_port->shadowLCR;
- ATEN2011_set_Uart_Reg(port, LINE_CONTROL_REGISTER, Data);
+ set_uart_reg(port, LINE_CONTROL_REGISTER, Data);
Data = 0x00b;
ATEN2011_port->shadowMCR = Data;
- ATEN2011_set_Uart_Reg(port, MODEM_CONTROL_REGISTER, Data);
+ set_uart_reg(port, MODEM_CONTROL_REGISTER, Data);
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 */
ATEN2011_port->shadowMCR = MCR_MASTER_IE;
- if (cflag & CBAUD) {
+ if (cflag & CBAUD)
ATEN2011_port->shadowMCR |= (MCR_DTR | MCR_RTS);
- }
- if (cflag & CRTSCTS) {
+ if (cflag & CRTSCTS)
ATEN2011_port->shadowMCR |= (MCR_XON_ANY);
-
- } else {
+ else
ATEN2011_port->shadowMCR &= ~(MCR_XON_ANY);
- }
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 */
baud = tty_get_baud_rate(tty);
if (!baud) {
/* pick a default, any default... */
- DPRINTK("%s\n", "Picked default baud...");
+ dbg("%s", "Picked default baud...");
baud = 9600;
}
- dbg("%s - baud rate = %d", __FUNCTION__, baud);
+ dbg("%s - baud rate = %d", __func__, baud);
status = ATEN2011_send_cmd_write_baud_rate(ATEN2011_port, baud);
/* Enable Interrupts */
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) {
ATEN2011_port->read_urb->dev = serial->dev;
status = usb_submit_urb(ATEN2011_port->read_urb, GFP_ATOMIC);
if (status) {
- DPRINTK
+ dbg
(" usb_submit_urb(read bulk) failed, status = %d",
status);
}
}
- DPRINTK
- ("ATEN2011_change_port_settings ATEN2011_port->shadowLCR is End %x\n",
+ dbg
+ ("ATEN2011_change_port_settings ATEN2011_port->shadowLCR is End %x",
ATEN2011_port->shadowLCR);
return;
ATEN_RDREQ, ATEN_RD_RTYPE, 0, GPIO_REGISTER,
&Data, VENDOR_READ_LENGTH, ATEN_WDR_TIMEOUT);
- //printk("ATEN2011_calc_num_ports GPIO is %x\n",Data);
-
/* ghostgum: here is where the problem appears to bet */
/* Which of the following are needed? */
/* Greg used the serial->type->num_ports=2 */
serial->type->num_ports = 2;
serial->num_ports = 2;
}
- //else if(serial->interface->cur_altsetting->desc.bNumEndpoints == 9)
+ /* else if(serial->interface->cur_altsetting->desc.bNumEndpoints == 9) */
else {
ATEN2011_2or4ports = 4;
serial->type->num_ports = 4;
int minor;
__u16 Data;
- DPRINTK("%s \n", " ATEN2011_startup :entering..........");
+ dbg("%s", " ATEN2011_startup :entering..........");
if (!serial) {
- DPRINTK("%s\n", "Invalid Handler");
+ dbg("%s", "Invalid Handler");
return -1;
}
dev = serial->dev;
- DPRINTK("%s\n", "Entering...");
+ dbg("%s", "Entering...");
/* create our private serial structure */
ATEN2011_serial = kzalloc(sizeof(struct ATENINTL_serial), GFP_KERNEL);
if (ATEN2011_serial == NULL) {
- err("%s - Out of memory", __FUNCTION__);
+ err("%s - Out of memory", __func__);
return -ENOMEM;
}
memset(ATEN2011_serial, 0, sizeof(struct ATENINTL_serial));
ATEN2011_serial->serial = serial;
- //initilize status polling flag to 0
+ /* initilize status polling flag to 0 */
ATEN2011_serial->status_polling_started = 0;
- ATEN2011_set_serial_private(serial, ATEN2011_serial);
+ usb_set_serial_data(serial, ATEN2011_serial);
ATEN2011_serial->ATEN2011_spectrum_2or4ports =
ATEN2011_calc_num_ports(serial);
/* we set up the pointers to the endpoints in the ATEN2011_open *
ATEN2011_port =
kmalloc(sizeof(struct ATENINTL_port), GFP_KERNEL);
if (ATEN2011_port == NULL) {
- err("%s - Out of memory", __FUNCTION__);
- ATEN2011_set_serial_private(serial, NULL);
+ err("%s - Out of memory", __func__);
+ usb_set_serial_data(serial, NULL);
kfree(ATEN2011_serial);
return -ENOMEM;
}
memset(ATEN2011_port, 0, sizeof(struct ATENINTL_port));
- /* Initialize all port interrupt end point to port 0 int endpoint *
- * Our device has only one interrupt end point comman to all port */
-
- // serial->port[i]->interrupt_in_endpointAddress = serial->port[0]->interrupt_in_endpointAddress;
+ /*
+ * Initialize all port interrupt end point to port 0
+ * int endpoint. Our device has only one interrupt end point
+ * comman to all port
+ */
+ /* serial->port[i]->interrupt_in_endpointAddress = serial->port[0]->interrupt_in_endpointAddress; */
ATEN2011_port->port = serial->port[i];
-//
- ATEN2011_set_port_private(serial->port[i], ATEN2011_port);
+ usb_set_serial_port_data(serial->port[i], ATEN2011_port);
minor = serial->port[i]->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR)
ATEN2011_port->ControlRegOffset = 0xd;
ATEN2011_port->DcrRegOffset = 0x1c;
}
- ATEN2011_Dump_serial_port(ATEN2011_port);
- ATEN2011_set_port_private(serial->port[i], ATEN2011_port);
+ usb_set_serial_port_data(serial->port[i], ATEN2011_port);
- //enable rx_disable bit in control register
+ /* enable rx_disable bit in control register */
- status =
- ATEN2011_get_reg_sync(serial->port[i],
- ATEN2011_port->ControlRegOffset,
- &Data);
+ status = get_reg_sync(serial->port[i],
+ ATEN2011_port->ControlRegOffset, &Data);
if (status < 0) {
- DPRINTK("Reading ControlReg failed status-0x%x\n",
+ dbg("Reading ControlReg failed status-0x%x",
status);
break;
} else
- DPRINTK
- ("ControlReg Reading success val is %x, status%d\n",
+ dbg
+ ("ControlReg Reading success val is %x, status%d",
Data, status);
- Data |= 0x08; //setting driver done bit
- Data |= 0x04; //sp1_bit to have cts change reflect in modem status reg
+ Data |= 0x08; /* setting driver done bit */
+ Data |= 0x04; /* sp1_bit to have cts change reflect in modem status reg */
- //Data |= 0x20; //rx_disable bit
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i],
- ATEN2011_port->ControlRegOffset,
- Data);
+ /* Data |= 0x20; */ /* rx_disable bit */
+ status = set_reg_sync(serial->port[i],
+ ATEN2011_port->ControlRegOffset, Data);
if (status < 0) {
- DPRINTK
- ("Writing ControlReg failed(rx_disable) status-0x%x\n",
+ dbg
+ ("Writing ControlReg failed(rx_disable) status-0x%x",
status);
break;
} else
- DPRINTK
- ("ControlReg Writing success(rx_disable) status%d\n",
+ dbg
+ ("ControlReg Writing success(rx_disable) status%d",
status);
- //Write default values in DCR (i.e 0x01 in DCR0, 0x05 in DCR2 and 0x24 in DCR3
+ /*
+ * Write default values in DCR (i.e 0x01 in DCR0, 0x05 in DCR2
+ * and 0x24 in DCR3
+ */
Data = 0x01;
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i],
- (__u16) (ATEN2011_port->DcrRegOffset +
- 0), Data);
+ status = set_reg_sync(serial->port[i],
+ (__u16)(ATEN2011_port->DcrRegOffset + 0),
+ Data);
if (status < 0) {
- DPRINTK("Writing DCR0 failed status-0x%x\n", status);
+ dbg("Writing DCR0 failed status-0x%x", status);
break;
} else
- DPRINTK("DCR0 Writing success status%d\n", status);
+ dbg("DCR0 Writing success status%d", status);
Data = 0x05;
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i],
- (__u16) (ATEN2011_port->DcrRegOffset +
- 1), Data);
+ status = set_reg_sync(serial->port[i],
+ (__u16)(ATEN2011_port->DcrRegOffset + 1),
+ Data);
if (status < 0) {
- DPRINTK("Writing DCR1 failed status-0x%x\n", status);
+ dbg("Writing DCR1 failed status-0x%x", status);
break;
} else
- DPRINTK("DCR1 Writing success status%d\n", status);
+ dbg("DCR1 Writing success status%d", status);
Data = 0x24;
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i],
- (__u16) (ATEN2011_port->DcrRegOffset +
- 2), Data);
+ status = set_reg_sync(serial->port[i],
+ (__u16)(ATEN2011_port->DcrRegOffset + 2),
+ Data);
if (status < 0) {
- DPRINTK("Writing DCR2 failed status-0x%x\n", status);
+ dbg("Writing DCR2 failed status-0x%x", status);
break;
} else
- DPRINTK("DCR2 Writing success status%d\n", status);
+ dbg("DCR2 Writing success status%d", status);
- // write values in clkstart0x0 and clkmulti 0x20
+ /* write values in clkstart0x0 and clkmulti 0x20 */
Data = 0x0;
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i],
- CLK_START_VALUE_REGISTER, Data);
+ status = set_reg_sync(serial->port[i], CLK_START_VALUE_REGISTER,
+ Data);
if (status < 0) {
- DPRINTK
- ("Writing CLK_START_VALUE_REGISTER failed status-0x%x\n",
+ dbg
+ ("Writing CLK_START_VALUE_REGISTER failed status-0x%x",
status);
break;
} else
- DPRINTK
- ("CLK_START_VALUE_REGISTER Writing success status%d\n",
+ dbg
+ ("CLK_START_VALUE_REGISTER Writing success status%d",
status);
Data = 0x20;
- status = 0;
- status =
- ATEN2011_set_reg_sync(serial->port[i], CLK_MULTI_REGISTER,
- Data);
+ status = set_reg_sync(serial->port[i], CLK_MULTI_REGISTER,
+ Data);
if (status < 0) {
- DPRINTK
- ("Writing CLK_MULTI_REGISTER failed status-0x%x\n",
+ dbg
+ ("Writing CLK_MULTI_REGISTER failed status-0x%x",
status);
break;
} else
- DPRINTK("CLK_MULTI_REGISTER Writing success status%d\n",
+ dbg("CLK_MULTI_REGISTER Writing success status%d",
status);
- //Zero Length flag register
+ /* Zero Length flag register */
if ((ATEN2011_port->port_num != 1)
&& (ATEN2011_serial->ATEN2011_spectrum_2or4ports == 2)) {
Data = 0xff;
- status = 0;
- status = ATEN2011_set_reg_sync(serial->port[i],
- (__u16) (ZLP_REG1 +
- ((__u16)
- ATEN2011_port->
- port_num)),
- Data);
- DPRINTK("ZLIP offset%x\n",
+ status = set_reg_sync(serial->port[i],
+ (__u16)(ZLP_REG1 + ((__u16)ATEN2011_port->port_num)),
+ Data);
+ dbg("ZLIP offset%x",
(__u16) (ZLP_REG1 +
((__u16) ATEN2011_port->port_num)));
if (status < 0) {
- DPRINTK
- ("Writing ZLP_REG%d failed status-0x%x\n",
+ dbg
+ ("Writing ZLP_REG%d failed status-0x%x",
i + 2, status);
break;
} else
- DPRINTK("ZLP_REG%d Writing success status%d\n",
+ dbg("ZLP_REG%d Writing success status%d",
i + 2, status);
} else {
Data = 0xff;
- status = 0;
- status = ATEN2011_set_reg_sync(serial->port[i],
- (__u16) (ZLP_REG1 +
- ((__u16)
- ATEN2011_port->
- port_num) -
- 0x1), Data);
- DPRINTK("ZLIP offset%x\n",
+ status = set_reg_sync(serial->port[i],
+ (__u16)(ZLP_REG1 + ((__u16)ATEN2011_port->port_num) - 0x1),
+ Data);
+ dbg("ZLIP offset%x",
(__u16) (ZLP_REG1 +
((__u16) ATEN2011_port->port_num) -
0x1));
if (status < 0) {
- DPRINTK
- ("Writing ZLP_REG%d failed status-0x%x\n",
+ dbg
+ ("Writing ZLP_REG%d failed status-0x%x",
i + 1, status);
break;
} else
- DPRINTK("ZLP_REG%d Writing success status%d\n",
+ dbg("ZLP_REG%d Writing success status%d",
i + 1, status);
}
}
- //Zero Length flag enable
+ /* Zero Length flag enable */
Data = 0x0f;
- status = 0;
- status = ATEN2011_set_reg_sync(serial->port[0], ZLP_REG5, Data);
+ status = set_reg_sync(serial->port[0], ZLP_REG5, Data);
if (status < 0) {
- DPRINTK("Writing ZLP_REG5 failed status-0x%x\n", status);
+ dbg("Writing ZLP_REG5 failed status-0x%x", status);
return -1;
} else
- DPRINTK("ZLP_REG5 Writing success status%d\n", status);
+ dbg("ZLP_REG5 Writing success status%d", status);
/* setting configuration feature to one */
usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
{
int i;
struct ATENINTL_port *ATEN2011_port;
- DPRINTK("%s \n", " shutdown :entering..........");
-
-/* MATRIX */
- //ThreadState = 1;
-/* MATRIX */
-
- if (!serial) {
- DPRINTK("%s", "Invalid Handler \n");
- return;
- }
- /* check for the ports to be closed,close the ports and disconnect */
+ /* check for the ports to be closed,close the ports and disconnect */
/* free private structure allocated for serial port *
* stop reads and writes on all ports */
for (i = 0; i < serial->num_ports; ++i) {
- ATEN2011_port = ATEN2011_get_port_private(serial->port[i]);
+ ATEN2011_port = usb_get_serial_port_data(serial->port[i]);
kfree(ATEN2011_port->ctrl_buf);
usb_kill_urb(ATEN2011_port->control_urb);
kfree(ATEN2011_port);
- ATEN2011_set_port_private(serial->port[i], NULL);
+ usb_set_serial_port_data(serial->port[i], NULL);
}
/* free private structure allocated for serial device */
- kfree(ATEN2011_get_serial_private(serial));
- ATEN2011_set_serial_private(serial, NULL);
-
- DPRINTK("%s\n", "Thank u :: ");
-
-}
-
-/* Inline functions to check the sanity of a pointer that is passed to us */
-static int ATEN2011_serial_paranoia_check(struct usb_serial *serial,
- const char *function)
-{
- if (!serial) {
- dbg("%s - serial == NULL", function);
- return -1;
- }
- if (!serial->type) {
- dbg("%s - serial->type == NULL!", function);
- return -1;
- }
-
- return 0;
-}
-static int ATEN2011_port_paranoia_check(struct usb_serial_port *port,
- const char *function)
-{
- if (!port) {
- dbg("%s - port == NULL", function);
- return -1;
- }
- if (!port->serial) {
- dbg("%s - port->serial == NULL", function);
- return -1;
- }
-
- return 0;
-}
-static struct usb_serial *ATEN2011_get_usb_serial(struct usb_serial_port *port,
- const char *function)
-{
- /* if no port was specified, or it fails a paranoia check */
- if (!port ||
- ATEN2011_port_paranoia_check(port, function) ||
- ATEN2011_serial_paranoia_check(port->serial, function)) {
- /* then say that we don't have a valid usb_serial thing, which will * end up genrating -ENODEV return values */
- return NULL;
- }
-
- return port->serial;
+ kfree(usb_get_serial_data(serial));
+ usb_set_serial_data(serial, NULL);
}
static struct usb_serial_driver aten_serial_driver = {
projects / linux-2.6-omap-h63xx.git / blobdiff