Skip to content

L
linux
Commit 15ed6cc0 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

cyclades: coding style & review 

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5b393e4
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 159 deletions
drivers/char/cyclades.c
View file @ 15ed6cc0
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
* *
* This version supports shared IRQ's (only for PCI boards). * This version supports shared IRQ's (only for PCI boards).
* *
* $Log: cyclades.c,v $
* Prevent users from opening non-existing Z ports. * Prevent users from opening non-existing Z ports.
* *
* Revision 2.3.2.8 2000/07/06 18:14:16 ivan * Revision 2.3.2.8 2000/07/06 18:14:16 ivan
...@@ -62,7 +61,7 @@ ...@@ -62,7 +61,7 @@
* Driver now makes sure that the constant SERIAL_XMIT_SIZE is defined; * Driver now makes sure that the constant SERIAL_XMIT_SIZE is defined;
* *
* Revision 2.3.2.2 1999/10/01 11:27:43 ivan * Revision 2.3.2.2 1999/10/01 11:27:43 ivan
* Fixed bug in cyz_poll that would make all ports but port 0 * Fixed bug in cyz_poll that would make all ports but port 0
* unable to transmit/receive data (Cyclades-Z only); * unable to transmit/receive data (Cyclades-Z only);
* Implemented logic to prevent the RX buffer from being stuck with data * Implemented logic to prevent the RX buffer from being stuck with data
* due to a driver / firmware race condition in interrupt op mode * due to a driver / firmware race condition in interrupt op mode
...@@ -83,25 +82,25 @@ ...@@ -83,25 +82,25 @@
* Revision 2.3.1.1 1999/07/15 16:45:53 ivan * Revision 2.3.1.1 1999/07/15 16:45:53 ivan
* Removed CY_PROC conditional compilation; * Removed CY_PROC conditional compilation;
* Implemented SMP-awareness for the driver; * Implemented SMP-awareness for the driver;
* Implemented a new ISA IRQ autoprobe that uses the irq_probe_[on|off] * Implemented a new ISA IRQ autoprobe that uses the irq_probe_[on|off]
* functions; * functions;
* The driver now accepts memory addresses (maddr=0xMMMMM) and IRQs * The driver now accepts memory addresses (maddr=0xMMMMM) and IRQs
* (irq=NN) as parameters (only for ISA boards); * (irq=NN) as parameters (only for ISA boards);
* Fixed bug in set_line_char that would prevent the Cyclades-Z * Fixed bug in set_line_char that would prevent the Cyclades-Z
* ports from being configured at speeds above 115.2Kbps; * ports from being configured at speeds above 115.2Kbps;
* Fixed bug in cy_set_termios that would prevent XON/XOFF flow control * Fixed bug in cy_set_termios that would prevent XON/XOFF flow control
* switching from working properly; * switching from working properly;
* The driver now only prints IRQ info for the Cyclades-Z if it's * The driver now only prints IRQ info for the Cyclades-Z if it's
* configured to work in interrupt mode; * configured to work in interrupt mode;
* *
* Revision 2.2.2.3 1999/06/28 11:13:29 ivan * Revision 2.2.2.3 1999/06/28 11:13:29 ivan
* Added support for interrupt mode operation for the Z cards; * Added support for interrupt mode operation for the Z cards;
* Removed the driver inactivity control for the Z; * Removed the driver inactivity control for the Z;
* Added a missing MOD_DEC_USE_COUNT in the cy_open function for when * Added a missing MOD_DEC_USE_COUNT in the cy_open function for when
* the Z firmware is not loaded yet; * the Z firmware is not loaded yet;
* Replaced the "manual" Z Tx flush buffer by a call to a FW command of * Replaced the "manual" Z Tx flush buffer by a call to a FW command of
* same functionality; * same functionality;
* Implemented workaround for IRQ setting loss on the PCI configuration * Implemented workaround for IRQ setting loss on the PCI configuration
* registers after a PCI bridge EEPROM reload (affects PLX9060 only); * registers after a PCI bridge EEPROM reload (affects PLX9060 only);
* *
* Revision 2.2.2.2 1999/05/14 17:18:15 ivan * Revision 2.2.2.2 1999/05/14 17:18:15 ivan
...@@ -112,22 +111,22 @@ ...@@ -112,22 +111,22 @@
* BREAK implementation changed in order to make use of the 'break_ctl' * BREAK implementation changed in order to make use of the 'break_ctl'
* TTY facility; * TTY facility;
* Fixed typo in TTY structure field 'driver_name'; * Fixed typo in TTY structure field 'driver_name';
* Included a PCI bridge reset and EEPROM reload in the board * Included a PCI bridge reset and EEPROM reload in the board
* initialization code (for both Y and Z series). * initialization code (for both Y and Z series).
* *
* Revision 2.2.2.1 1999/04/08 16:17:43 ivan * Revision 2.2.2.1 1999/04/08 16:17:43 ivan
* Fixed a bug in cy_wait_until_sent that was preventing the port to be * Fixed a bug in cy_wait_until_sent that was preventing the port to be
* closed properly after a SIGINT; * closed properly after a SIGINT;
* Module usage counter scheme revisited; * Module usage counter scheme revisited;
* Added support to the upcoming Y PCI boards (i.e., support to additional * Added support to the upcoming Y PCI boards (i.e., support to additional
* PCI Device ID's). * PCI Device ID's).
* *
* Revision 2.2.1.10 1999/01/20 16:14:29 ivan * Revision 2.2.1.10 1999/01/20 16:14:29 ivan
* Removed all unnecessary page-alignement operations in ioremap calls * Removed all unnecessary page-alignement operations in ioremap calls
* (ioremap is currently safe for these operations). * (ioremap is currently safe for these operations).
* *
* Revision 2.2.1.9 1998/12/30 18:18:30 ivan * Revision 2.2.1.9 1998/12/30 18:18:30 ivan
* Changed access to PLX PCI bridge registers from I/O to MMIO, in * Changed access to PLX PCI bridge registers from I/O to MMIO, in
* order to make PLX9050-based boards work with certain motherboards. * order to make PLX9050-based boards work with certain motherboards.
* *
* Revision 2.2.1.8 1998/11/13 12:46:20 ivan * Revision 2.2.1.8 1998/11/13 12:46:20 ivan
...@@ -148,7 +147,7 @@ ...@@ -148,7 +147,7 @@
* Fixed Cyclom-4Yo hardware detection bug. * Fixed Cyclom-4Yo hardware detection bug.
* *
* Revision 2.2.1.4 1998/08/04 11:02:50 ivan * Revision 2.2.1.4 1998/08/04 11:02:50 ivan
* /proc/cyclades implementation with great collaboration of * /proc/cyclades implementation with great collaboration of
* Marc Lewis <marc@blarg.net>; * Marc Lewis <marc@blarg.net>;
* cyy_interrupt was changed to avoid occurrence of kernel oopses * cyy_interrupt was changed to avoid occurrence of kernel oopses
* during PPP operation. * during PPP operation.
...@@ -157,7 +156,7 @@ ...@@ -157,7 +156,7 @@
* General code review in order to comply with 2.1 kernel standards; * General code review in order to comply with 2.1 kernel standards;
* data loss prevention for slow devices revisited (cy_wait_until_sent * data loss prevention for slow devices revisited (cy_wait_until_sent
* was created); * was created);
* removed conditional compilation for new/old PCI structure support * removed conditional compilation for new/old PCI structure support
* (now the driver only supports the new PCI structure). * (now the driver only supports the new PCI structure).
* *
* Revision 2.2.1.1 1998/03/19 16:43:12 ivan * Revision 2.2.1.1 1998/03/19 16:43:12 ivan
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
* cleaned up the data loss fix; * cleaned up the data loss fix;
* fixed XON/XOFF handling once more (Cyclades-Z); * fixed XON/XOFF handling once more (Cyclades-Z);
* general review of the driver routines; * general review of the driver routines;
* introduction of a mechanism to prevent data loss with slow * introduction of a mechanism to prevent data loss with slow
* printers, by forcing a delay before closing the port. * printers, by forcing a delay before closing the port.
* *
* Revision 2.1.1.2 1998/02/17 16:50:00 ivan * Revision 2.1.1.2 1998/02/17 16:50:00 ivan
...@@ -182,12 +181,12 @@ ...@@ -182,12 +181,12 @@
* Code review for the module cleanup routine; * Code review for the module cleanup routine;
* fixed RTS and DTR status report for new CD1400's in get_modem_info; * fixed RTS and DTR status report for new CD1400's in get_modem_info;
* includes anonymous changes regarding signal_pending. * includes anonymous changes regarding signal_pending.
* *
* Revision 2.1 1997/11/01 17:42:41 ivan * Revision 2.1 1997/11/01 17:42:41 ivan
* Changes in the driver to support Alpha systems (except 8Zo V_1); * Changes in the driver to support Alpha systems (except 8Zo V_1);
* BREAK fix for the Cyclades-Z boards; * BREAK fix for the Cyclades-Z boards;
* driver inactivity control by FW implemented; * driver inactivity control by FW implemented;
* introduction of flag that allows driver to take advantage of * introduction of flag that allows driver to take advantage of
* a special CD1400 feature related to HW flow control; * a special CD1400 feature related to HW flow control;
* added support for the CD1400 rev. J (Cyclom-Y boards); * added support for the CD1400 rev. J (Cyclom-Y boards);
* introduction of ioctls to: * introduction of ioctls to:
...@@ -196,17 +195,17 @@ ...@@ -196,17 +195,17 @@
* - adjust the polling interval (Cyclades-Z); * - adjust the polling interval (Cyclades-Z);
* *
* Revision 1.36.4.33 1997/06/27 19:00:00 ivan * Revision 1.36.4.33 1997/06/27 19:00:00 ivan
* Fixes related to kernel version conditional * Fixes related to kernel version conditional
* compilation. * compilation.
* *
* Revision 1.36.4.32 1997/06/14 19:30:00 ivan * Revision 1.36.4.32 1997/06/14 19:30:00 ivan
* Compatibility issues between kernels 2.0.x and * Compatibility issues between kernels 2.0.x and
* 2.1.x (mainly related to clear_bit function). * 2.1.x (mainly related to clear_bit function).
* *
* Revision 1.36.4.31 1997/06/03 15:30:00 ivan * Revision 1.36.4.31 1997/06/03 15:30:00 ivan
* Changes to define the memory window according to the * Changes to define the memory window according to the
* board type. * board type.
* *
* Revision 1.36.4.30 1997/05/16 15:30:00 daniel * Revision 1.36.4.30 1997/05/16 15:30:00 daniel
* Changes to support new cycladesZ boards. * Changes to support new cycladesZ boards.
* *
...@@ -624,7 +623,7 @@ ...@@ -624,7 +623,7 @@
#undef CY_PCI_DEBUG #undef CY_PCI_DEBUG
/* /*
* Include section * Include section
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -649,9 +648,9 @@ ...@@ -649,9 +648,9 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pci.h> #include <linux/pci.h>
...@@ -668,10 +667,10 @@ static void cy_send_xchar(struct tty_struct *tty, char ch); ...@@ -668,10 +667,10 @@ static void cy_send_xchar(struct tty_struct *tty, char ch);
((readl(&((struct RUNTIME_9060 __iomem *) \ ((readl(&((struct RUNTIME_9060 __iomem *) \
((card).ctl_addr))->init_ctrl) & (1<<17)) != 0) ((card).ctl_addr))->init_ctrl) & (1<<17)) != 0)
#define ISZLOADED(card) (((ZO_V1==readl(&((struct RUNTIME_9060 __iomem *) \ #define ISZLOADED(card) (((ZO_V1 == readl(&((struct RUNTIME_9060 __iomem *) \
((card).ctl_addr))->mail_box_0)) || \ ((card).ctl_addr))->mail_box_0)) || \
Z_FPGA_CHECK(card)) && \ Z_FPGA_CHECK(card)) && \
(ZFIRM_ID==readl(&((struct FIRM_ID __iomem *) \ (ZFIRM_ID == readl(&((struct FIRM_ID __iomem *) \
((card).base_addr+ID_ADDRESS))->signature))) ((card).base_addr+ID_ADDRESS))->signature)))
#ifndef SERIAL_XMIT_SIZE #ifndef SERIAL_XMIT_SIZE
...@@ -809,12 +808,12 @@ static char baud_cor3[] = { /* receive threshold */ ...@@ -809,12 +808,12 @@ static char baud_cor3[] = { /* receive threshold */
/* /*
* The Cyclades driver implements HW flow control as any serial driver. * The Cyclades driver implements HW flow control as any serial driver.
* The cyclades_port structure member rflow and the vector rflow_thr * The cyclades_port structure member rflow and the vector rflow_thr
* allows us to take advantage of a special feature in the CD1400 to avoid * allows us to take advantage of a special feature in the CD1400 to avoid
* data loss even when the system interrupt latency is too high. These flags * data loss even when the system interrupt latency is too high. These flags
* are to be used only with very special applications. Setting these flags * are to be used only with very special applications. Setting these flags
* requires the use of a special cable (DTR and RTS reversed). In the new * requires the use of a special cable (DTR and RTS reversed). In the new
* CD1400-based boards (rev. 6.00 or later), there is no need for special * CD1400-based boards (rev. 6.00 or later), there is no need for special
* cables. * cables.
*/ */
...@@ -841,14 +840,22 @@ static int cy_chip_offset[] = { 0x0000, ...@@ -841,14 +840,22 @@ static int cy_chip_offset[] = { 0x0000,
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_device_id cy_pci_dev_id[] __devinitdata = { static struct pci_device_id cy_pci_dev_id[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) }, /* PCI < 1Mb */ /* PCI < 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Hi) }, /* PCI > 1Mb */ { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) },
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_4Y_Lo) }, /* 4Y PCI < 1Mb */ /* PCI > 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_4Y_Hi) }, /* 4Y PCI > 1Mb */ { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Hi) },
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_8Y_Lo) }, /* 8Y PCI < 1Mb */ /* 4Y PCI < 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_8Y_Hi) }, /* 8Y PCI > 1Mb */ { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_4Y_Lo) },
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Z_Lo) }, /* Z PCI < 1Mb */ /* 4Y PCI > 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Z_Hi) }, /* Z PCI > 1Mb */ { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_4Y_Hi) },
/* 8Y PCI < 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_8Y_Lo) },
/* 8Y PCI > 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_8Y_Hi) },
/* Z PCI < 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Z_Lo) },
/* Z PCI > 1Mb */
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Z_Hi) },
{ } /* end of table */ { } /* end of table */
}; };
MODULE_DEVICE_TABLE(pci, cy_pci_dev_id); MODULE_DEVICE_TABLE(pci, cy_pci_dev_id);
...@@ -905,15 +912,14 @@ static inline int serial_paranoia_check(struct cyclades_port *info, ...@@ -905,15 +912,14 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
This function is only called from inside spinlock-protected code. This function is only called from inside spinlock-protected code.
*/ */
static int cyy_issue_cmd(void __iomem * base_addr, u_char cmd, int index) static int cyy_issue_cmd(void __iomem *base_addr, u_char cmd, int index)
{ {
unsigned int i; unsigned int i;
/* Check to see that the previous command has completed */ /* Check to see that the previous command has completed */
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
if (readb(base_addr + (CyCCR << index)) == 0) { if (readb(base_addr + (CyCCR << index)) == 0)
break; break;
}
udelay(10L); udelay(10L);
} }
/* if the CCR never cleared, the previous command /* if the CCR never cleared, the previous command
...@@ -929,7 +935,7 @@ static int cyy_issue_cmd(void __iomem * base_addr, u_char cmd, int index) ...@@ -929,7 +935,7 @@ static int cyy_issue_cmd(void __iomem * base_addr, u_char cmd, int index)
#ifdef CONFIG_ISA #ifdef CONFIG_ISA
/* ISA interrupt detection code */ /* ISA interrupt detection code */
static unsigned detect_isa_irq(void __iomem * address) static unsigned detect_isa_irq(void __iomem *address)
{ {
int irq; int irq;
unsigned long irqs, flags; unsigned long irqs, flags;
...@@ -1038,7 +1044,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip, ...@@ -1038,7 +1044,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
if (info->flags & ASYNC_SAK) if (info->flags & ASYNC_SAK)
do_SAK(tty); do_SAK(tty);
} else if (data & CyFRAME) { } else if (data & CyFRAME) {
tty_insert_flip_char( tty, tty_insert_flip_char(tty,
readb(base_addr + (CyRDSR << readb(base_addr + (CyRDSR <<
index)), TTY_FRAME); index)), TTY_FRAME);
info->icount.rx++; info->icount.rx++;
...@@ -1320,7 +1326,8 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id) ...@@ -1320,7 +1326,8 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
if (unlikely(cinfo == NULL)) { if (unlikely(cinfo == NULL)) {
#ifdef CY_DEBUG_INTERRUPTS #ifdef CY_DEBUG_INTERRUPTS
printk(KERN_DEBUG "cyy_interrupt: spurious interrupt %d\n",irq); printk(KERN_DEBUG "cyy_interrupt: spurious interrupt %d\n",
irq);
#endif #endif
return IRQ_NONE; /* spurious interrupt */ return IRQ_NONE; /* spurious interrupt */
} }
...@@ -1375,12 +1382,12 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id) ...@@ -1375,12 +1382,12 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
/***********************************************************/ /***********************************************************/
/********* End of block of Cyclom-Y specific code **********/ /********* End of block of Cyclom-Y specific code **********/
/******** Start of block of Cyclades-Z specific code *********/ /******** Start of block of Cyclades-Z specific code *******/
/***********************************************************/ /***********************************************************/
static int static int
cyz_fetch_msg(struct cyclades_card *cinfo, cyz_fetch_msg(struct cyclades_card *cinfo,
__u32 * channel, __u8 * cmd, __u32 * param) __u32 *channel, __u8 *cmd, __u32 *param)
{ {
struct FIRM_ID __iomem *firm_id; struct FIRM_ID __iomem *firm_id;
struct ZFW_CTRL __iomem *zfw_ctrl; struct ZFW_CTRL __iomem *zfw_ctrl;
...@@ -1388,9 +1395,8 @@ cyz_fetch_msg(struct cyclades_card *cinfo, ...@@ -1388,9 +1395,8 @@ cyz_fetch_msg(struct cyclades_card *cinfo,
unsigned long loc_doorbell; unsigned long loc_doorbell;
firm_id = cinfo->base_addr + ID_ADDRESS; firm_id = cinfo->base_addr + ID_ADDRESS;
if (!ISZLOADED(*cinfo)) { if (!ISZLOADED(*cinfo))
return -1; return -1;
}
zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff); zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
board_ctrl = &zfw_ctrl->board_ctrl; board_ctrl = &zfw_ctrl->board_ctrl;
...@@ -1418,9 +1424,9 @@ cyz_issue_cmd(struct cyclades_card *cinfo, ...@@ -1418,9 +1424,9 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
unsigned int index; unsigned int index;
firm_id = cinfo->base_addr + ID_ADDRESS; firm_id = cinfo->base_addr + ID_ADDRESS;
if (!ISZLOADED(*cinfo)) { if (!ISZLOADED(*cinfo))
return -1; return -1;
}
zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff); zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
board_ctrl = &zfw_ctrl->board_ctrl; board_ctrl = &zfw_ctrl->board_ctrl;
...@@ -1428,9 +1434,8 @@ cyz_issue_cmd(struct cyclades_card *cinfo, ...@@ -1428,9 +1434,8 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
pci_doorbell = pci_doorbell =
&((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->pci_doorbell; &((struct RUNTIME_9060 __iomem *)(cinfo->ctl_addr))->pci_doorbell;
while ((readl(pci_doorbell) & 0xff) != 0) { while ((readl(pci_doorbell) & 0xff) != 0) {
if (index++ == 1000) { if (index++ == 1000)
return (int)(readl(pci_doorbell) & 0xff); return (int)(readl(pci_doorbell) & 0xff);
}
udelay(50L); udelay(50L);
} }
cy_writel(&board_ctrl->hcmd_channel, channel); cy_writel(&board_ctrl->hcmd_channel, channel);
...@@ -1504,7 +1509,8 @@ static void cyz_handle_rx(struct cyclades_port *info, ...@@ -1504,7 +1509,8 @@ static void cyz_handle_rx(struct cyclades_port *info,
while (len--) { while (len--) {
data = readb(cinfo->base_addr + rx_bufaddr + data = readb(cinfo->base_addr + rx_bufaddr +
new_rx_get); new_rx_get);
new_rx_get = (new_rx_get + 1)& (rx_bufsize - 1); new_rx_get = (new_rx_get + 1) &
(rx_bufsize - 1);
tty_insert_flip_char(tty, data, TTY_NORMAL); tty_insert_flip_char(tty, data, TTY_NORMAL);
info->idle_stats.recv_bytes++; info->idle_stats.recv_bytes++;
info->icount.rx++; info->icount.rx++;
...@@ -1636,7 +1642,8 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo) ...@@ -1636,7 +1642,8 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
special_count = 0; special_count = 0;
delta_count = 0; delta_count = 0;
info = &cinfo->ports[channel]; info = &cinfo->ports[channel];
if ((tty = info->tty) == NULL) tty = info->tty;
if (tty == NULL)
continue; continue;
ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]); ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
...@@ -1732,7 +1739,8 @@ static irqreturn_t cyz_interrupt(int irq, void *dev_id) ...@@ -1732,7 +1739,8 @@ static irqreturn_t cyz_interrupt(int irq, void *dev_id)
if (unlikely(cinfo == NULL)) { if (unlikely(cinfo == NULL)) {
#ifdef CY_DEBUG_INTERRUPTS #ifdef CY_DEBUG_INTERRUPTS
printk(KERN_DEBUG "cyz_interrupt: spurious interrupt %d\n",irq); printk(KERN_DEBUG "cyz_interrupt: spurious interrupt %d\n",
irq);
#endif #endif
return IRQ_NONE; /* spurious interrupt */ return IRQ_NONE; /* spurious interrupt */
} }
...@@ -1851,9 +1859,8 @@ static int startup(struct cyclades_port *info) ...@@ -1851,9 +1859,8 @@ static int startup(struct cyclades_port *info)
} }
if (!info->type) { if (!info->type) {
if (info->tty) { if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags); set_bit(TTY_IO_ERROR, &info->tty->flags);
}
free_page(page); free_page(page);
goto errout; goto errout;
} }
...@@ -1904,9 +1911,8 @@ static int startup(struct cyclades_port *info) ...@@ -1904,9 +1911,8 @@ static int startup(struct cyclades_port *info)
readb(base_addr + (CySRER << index)) | CyRxData); readb(base_addr + (CySRER << index)) | CyRxData);
info->flags |= ASYNC_INITIALIZED; info->flags |= ASYNC_INITIALIZED;
if (info->tty) { if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags); clear_bit(TTY_IO_ERROR, &info->tty->flags);
}
info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
info->breakon = info->breakoff = 0; info->breakon = info->breakoff = 0;
memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats)); memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
...@@ -1925,9 +1931,8 @@ static int startup(struct cyclades_port *info) ...@@ -1925,9 +1931,8 @@ static int startup(struct cyclades_port *info)
base_addr = card->base_addr; base_addr = card->base_addr;
firm_id = base_addr + ID_ADDRESS; firm_id = base_addr + ID_ADDRESS;
if (!ISZLOADED(*card)) { if (!ISZLOADED(*card))
return -ENODEV; return -ENODEV;
}
zfw_ctrl = card->base_addr + zfw_ctrl = card->base_addr +
(readl(&firm_id->zfwctrl_addr) & 0xfffff); (readl(&firm_id->zfwctrl_addr) & 0xfffff);
...@@ -1990,9 +1995,8 @@ static int startup(struct cyclades_port *info) ...@@ -1990,9 +1995,8 @@ static int startup(struct cyclades_port *info)
/* enable send, recv, modem !!! */ /* enable send, recv, modem !!! */
info->flags |= ASYNC_INITIALIZED; info->flags |= ASYNC_INITIALIZED;
if (info->tty) { if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags); clear_bit(TTY_IO_ERROR, &info->tty->flags);
}
info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
info->breakon = info->breakoff = 0; info->breakon = info->breakoff = 0;
memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats)); memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
...@@ -2061,9 +2065,8 @@ static void shutdown(struct cyclades_port *info) ...@@ -2061,9 +2065,8 @@ static void shutdown(struct cyclades_port *info)
void __iomem *base_addr; void __iomem *base_addr;
int chip, channel, index; int chip, channel, index;
if (!(info->flags & ASYNC_INITIALIZED)) { if (!(info->flags & ASYNC_INITIALIZED))
return; return;
}
card = info->card; card = info->card;
channel = info->line - card->first_line; channel = info->line - card->first_line;
...@@ -2105,9 +2108,8 @@ static void shutdown(struct cyclades_port *info) ...@@ -2105,9 +2108,8 @@ static void shutdown(struct cyclades_port *info)
/* it may be appropriate to clear _XMIT at /* it may be appropriate to clear _XMIT at
some later date (after testing)!!! */ some later date (after testing)!!! */
if (info->tty) { if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags); set_bit(TTY_IO_ERROR, &info->tty->flags);
}
info->flags &= ~ASYNC_INITIALIZED; info->flags &= ~ASYNC_INITIALIZED;
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
} else { } else {
...@@ -2124,9 +2126,8 @@ static void shutdown(struct cyclades_port *info) ...@@ -2124,9 +2126,8 @@ static void shutdown(struct cyclades_port *info)
#endif #endif
firm_id = base_addr + ID_ADDRESS; firm_id = base_addr + ID_ADDRESS;
if (!ISZLOADED(*card)) { if (!ISZLOADED(*card))
return; return;
}
zfw_ctrl = card->base_addr + zfw_ctrl = card->base_addr +
(readl(&firm_id->zfwctrl_addr) & 0xfffff); (readl(&firm_id->zfwctrl_addr) & 0xfffff);
...@@ -2157,9 +2158,8 @@ static void shutdown(struct cyclades_port *info) ...@@ -2157,9 +2158,8 @@ static void shutdown(struct cyclades_port *info)
#endif #endif
} }
if (info->tty) { if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags); set_bit(TTY_IO_ERROR, &info->tty->flags);
}
info->flags &= ~ASYNC_INITIALIZED; info->flags &= ~ASYNC_INITIALIZED;
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
...@@ -2204,7 +2204,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp, ...@@ -2204,7 +2204,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
* If non-blocking mode is set, then make the check up front * If non-blocking mode is set, then make the check up front
* and then exit. * and then exit.
*/ */
if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) { if ((filp->f_flags & O_NONBLOCK) ||
(tty->flags & (1 << TTY_IO_ERROR))) {
info->flags |= ASYNC_NORMAL_ACTIVE; info->flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
...@@ -2301,7 +2302,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp, ...@@ -2301,7 +2302,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
return -EINVAL; return -EINVAL;
} }
zfw_ctrl = base_addr + (readl(&firm_id->zfwctrl_addr)& 0xfffff); zfw_ctrl = base_addr + (readl(&firm_id->zfwctrl_addr)
& 0xfffff);
board_ctrl = &zfw_ctrl->board_ctrl; board_ctrl = &zfw_ctrl->board_ctrl;
ch_ctrl = zfw_ctrl->ch_ctrl; ch_ctrl = zfw_ctrl->ch_ctrl;
...@@ -2378,9 +2380,9 @@ static int cy_open(struct tty_struct *tty, struct file *filp) ...@@ -2378,9 +2380,9 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
int retval; int retval;
line = tty->index; line = tty->index;
if ((tty->index < 0) || (NR_PORTS <= line)) { if (tty->index < 0 || NR_PORTS <= line)
return -ENODEV; return -ENODEV;
}
for (i = 0; i < NR_CARDS; i++) for (i = 0; i < NR_CARDS; i++)
if (line < cy_card[i].first_line + cy_card[i].nports && if (line < cy_card[i].first_line + cy_card[i].nports &&
line >= cy_card[i].first_line) line >= cy_card[i].first_line)
...@@ -2388,9 +2390,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp) ...@@ -2388,9 +2390,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
if (i >= NR_CARDS) if (i >= NR_CARDS)
return -ENODEV; return -ENODEV;
info = &cy_card[i].ports[line - cy_card[i].first_line]; info = &cy_card[i].ports[line - cy_card[i].first_line];
if (info->line < 0) { if (info->line < 0)
return -ENODEV; return -ENODEV;
}
/* If the card's firmware hasn't been loaded, /* If the card's firmware hasn't been loaded,
treat it as absent from the system. This treat it as absent from the system. This
...@@ -2456,9 +2457,9 @@ static int cy_open(struct tty_struct *tty, struct file *filp) ...@@ -2456,9 +2457,9 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
#endif #endif
tty->driver_data = info; tty->driver_data = info;
info->tty = tty; info->tty = tty;
if (serial_paranoia_check(info, tty->name, "cy_open")) { if (serial_paranoia_check(info, tty->name, "cy_open"))
return -ENODEV; return -ENODEV;
}
#ifdef CY_DEBUG_OPEN #ifdef CY_DEBUG_OPEN
printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line, printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
info->count); info->count);
...@@ -2482,9 +2483,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp) ...@@ -2482,9 +2483,8 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
* Start up serial port * Start up serial port
*/ */
retval = startup(info); retval = startup(info);
if (retval) { if (retval)
return retval; return retval;
}
retval = block_til_ready(tty, filp, info); retval = block_til_ready(tty, filp, info);
if (retval) { if (retval) {
...@@ -2591,9 +2591,8 @@ static void cy_close(struct tty_struct *tty, struct file *filp) ...@@ -2591,9 +2591,8 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
printk(KERN_DEBUG "cyc:cy_close ttyC%d\n", info->line); printk(KERN_DEBUG "cyc:cy_close ttyC%d\n", info->line);
#endif #endif
if (!info || serial_paranoia_check(info, tty->name, "cy_close")) { if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
return; return;
}
card = info->card; card = info->card;
...@@ -2641,9 +2640,9 @@ static void cy_close(struct tty_struct *tty, struct file *filp) ...@@ -2641,9 +2640,9 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
*/ */
tty->closing = 1; tty->closing = 1;
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
if (info->closing_wait != CY_CLOSING_WAIT_NONE) { if (info->closing_wait != CY_CLOSING_WAIT_NONE)
tty_wait_until_sent(tty, info->closing_wait); tty_wait_until_sent(tty, info->closing_wait);
}
spin_lock_irqsave(&card->card_lock, flags); spin_lock_irqsave(&card->card_lock, flags);
if (!IS_CYC_Z(*card)) { if (!IS_CYC_Z(*card)) {
...@@ -2657,15 +2656,16 @@ static void cy_close(struct tty_struct *tty, struct file *filp) ...@@ -2657,15 +2656,16 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
cy_writeb(base_addr + (CySRER << index), cy_writeb(base_addr + (CySRER << index),
readb(base_addr + (CySRER << index)) & ~CyRxData); readb(base_addr + (CySRER << index)) & ~CyRxData);
if (info->flags & ASYNC_INITIALIZED) { if (info->flags & ASYNC_INITIALIZED) {
/* Waiting for on-board buffers to be empty before closing /* Waiting for on-board buffers to be empty before
the port */ closing the port */
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
cy_wait_until_sent(tty, info->timeout); cy_wait_until_sent(tty, info->timeout);
spin_lock_irqsave(&card->card_lock, flags); spin_lock_irqsave(&card->card_lock, flags);
} }
} else { } else {
#ifdef Z_WAKE #ifdef Z_WAKE
/* Waiting for on-board buffers to be empty before closing the port */ /* Waiting for on-board buffers to be empty before closing
the port */
void __iomem *base_addr = card->base_addr; void __iomem *base_addr = card->base_addr;
struct FIRM_ID __iomem *firm_id = base_addr + ID_ADDRESS; struct FIRM_ID __iomem *firm_id = base_addr + ID_ADDRESS;
struct ZFW_CTRL __iomem *zfw_ctrl = struct ZFW_CTRL __iomem *zfw_ctrl =
...@@ -2738,9 +2738,8 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) ...@@ -2738,9 +2738,8 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
printk(KERN_DEBUG "cyc:cy_write ttyC%d\n", info->line); printk(KERN_DEBUG "cyc:cy_write ttyC%d\n", info->line);
#endif #endif
if (serial_paranoia_check(info, tty->name, "cy_write")) { if (serial_paranoia_check(info, tty->name, "cy_write"))
return 0; return 0;
}
if (!info->xmit_buf) if (!info->xmit_buf)
return 0; return 0;
...@@ -2766,9 +2765,9 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) ...@@ -2766,9 +2765,9 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
info->idle_stats.xmit_bytes += ret; info->idle_stats.xmit_bytes += ret;
info->idle_stats.xmit_idle = jiffies; info->idle_stats.xmit_idle = jiffies;
if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) { if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped)
start_xmit(info); start_xmit(info);
}
return ret; return ret;
} /* cy_write */ } /* cy_write */
...@@ -2810,7 +2809,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -2810,7 +2809,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
/* /*
* This routine is called by the kernel after it has written a * This routine is called by the kernel after it has written a
* series of characters to the tty device using put_char(). * series of characters to the tty device using put_char().
*/ */
static void cy_flush_chars(struct tty_struct *tty) static void cy_flush_chars(struct tty_struct *tty)
{ {
...@@ -2950,12 +2949,12 @@ static void set_line_char(struct cyclades_port *info) ...@@ -2950,12 +2949,12 @@ static void set_line_char(struct cyclades_port *info)
int baud, baud_rate = 0; int baud, baud_rate = 0;
int i; int i;
if (!info->tty || !info->tty->termios) { if (!info->tty || !info->tty->termios)
return; return;
}
if (info->line == -1) { if (info->line == -1)
return; return;
}
cflag = info->tty->termios->c_cflag; cflag = info->tty->termios->c_cflag;
iflag = info->tty->termios->c_iflag; iflag = info->tty->termios->c_iflag;
...@@ -2994,13 +2993,11 @@ static void set_line_char(struct cyclades_port *info) ...@@ -2994,13 +2993,11 @@ static void set_line_char(struct cyclades_port *info)
} }
/* find the baud index */ /* find the baud index */
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
if (baud == baud_table[i]) { if (baud == baud_table[i])
break; break;
}
} }
if (i == 20) { if (i == 20)
i = 19; /* CD1400_MAX_SPEED */ i = 19; /* CD1400_MAX_SPEED */
}
if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) == if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
ASYNC_SPD_CUST) { ASYNC_SPD_CUST) {
...@@ -3059,18 +3056,16 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3059,18 +3056,16 @@ static void set_line_char(struct cyclades_port *info)
info->cor1 = Cy_8_BITS; info->cor1 = Cy_8_BITS;
break; break;
} }
if (cflag & CSTOPB) { if (cflag & CSTOPB)
info->cor1 |= Cy_2_STOP; info->cor1 |= Cy_2_STOP;
}
if (cflag & PARENB) { if (cflag & PARENB) {
if (cflag & PARODD) { if (cflag & PARODD)
info->cor1 |= CyPARITY_O; info->cor1 |= CyPARITY_O;
} else { else
info->cor1 |= CyPARITY_E; info->cor1 |= CyPARITY_E;
} } else
} else {
info->cor1 |= CyPARITY_NONE; info->cor1 |= CyPARITY_NONE;
}
/* CTS flow control flag */ /* CTS flow control flag */
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
...@@ -3123,7 +3118,8 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3123,7 +3118,8 @@ static void set_line_char(struct cyclades_port *info)
cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch | cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
CyCOR3ch, index); CyCOR3ch, index);
cy_writeb(base_addr + (CyCAR << index), (u_char) channel); /* !!! Is this needed? */ /* !!! Is this needed? */
cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
cy_writeb(base_addr + (CyRTPR << index), cy_writeb(base_addr + (CyRTPR << index),
(info->default_timeout ? info->default_timeout : 0x02)); (info->default_timeout ? info->default_timeout : 0x02));
/* 10ms rx timeout */ /* 10ms rx timeout */
...@@ -3191,9 +3187,8 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3191,9 +3187,8 @@ static void set_line_char(struct cyclades_port *info)
#endif #endif
} }
if (info->tty) { if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags); clear_bit(TTY_IO_ERROR, &info->tty->flags);
}
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
} else { } else {
...@@ -3206,9 +3201,8 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3206,9 +3201,8 @@ static void set_line_char(struct cyclades_port *info)
int retval; int retval;
firm_id = card->base_addr + ID_ADDRESS; firm_id = card->base_addr + ID_ADDRESS;
if (!ISZLOADED(*card)) { if (!ISZLOADED(*card))
return; return;
}
zfw_ctrl = card->base_addr + zfw_ctrl = card->base_addr +
(readl(&firm_id->zfwctrl_addr) & 0xfffff); (readl(&firm_id->zfwctrl_addr) & 0xfffff);
...@@ -3268,14 +3262,12 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3268,14 +3262,12 @@ static void set_line_char(struct cyclades_port *info)
readl(&ch_ctrl->comm_data_l) | C_DL_1STOP); readl(&ch_ctrl->comm_data_l) | C_DL_1STOP);
} }
if (cflag & PARENB) { if (cflag & PARENB) {
if (cflag & PARODD) { if (cflag & PARODD)
cy_writel(&ch_ctrl->comm_parity, C_PR_ODD); cy_writel(&ch_ctrl->comm_parity, C_PR_ODD);
} else { else
cy_writel(&ch_ctrl->comm_parity, C_PR_EVEN); cy_writel(&ch_ctrl->comm_parity, C_PR_EVEN);
} } else
} else {
cy_writel(&ch_ctrl->comm_parity, C_PR_NONE); cy_writel(&ch_ctrl->comm_parity, C_PR_NONE);
}
/* CTS flow control flag */ /* CTS flow control flag */
if (cflag & CRTSCTS) { if (cflag & CRTSCTS) {
...@@ -3305,11 +3297,10 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3305,11 +3297,10 @@ static void set_line_char(struct cyclades_port *info)
} }
/* CD sensitivity */ /* CD sensitivity */
if (cflag & CLOCAL) { if (cflag & CLOCAL)
info->flags &= ~ASYNC_CHECK_CD; info->flags &= ~ASYNC_CHECK_CD;
} else { else
info->flags |= ASYNC_CHECK_CD; info->flags |= ASYNC_CHECK_CD;
}
if (baud == 0) { /* baud rate is zero, turn off line */ if (baud == 0) { /* baud rate is zero, turn off line */
cy_writel(&ch_ctrl->rs_control, cy_writel(&ch_ctrl->rs_control,
...@@ -3325,21 +3316,20 @@ static void set_line_char(struct cyclades_port *info) ...@@ -3325,21 +3316,20 @@ static void set_line_char(struct cyclades_port *info)
#endif #endif
} }
retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM,0L); retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
if (retval != 0) { if (retval != 0) {
printk(KERN_ERR "cyc:set_line_char(2) retval on ttyC%d " printk(KERN_ERR "cyc:set_line_char(2) retval on ttyC%d "
"was %x\n", info->line, retval); "was %x\n", info->line, retval);
} }
if (info->tty) { if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags); clear_bit(TTY_IO_ERROR, &info->tty->flags);
}
} }
} /* set_line_char */ } /* set_line_char */
static int static int
get_serial_info(struct cyclades_port *info, get_serial_info(struct cyclades_port *info,
struct serial_struct __user * retinfo) struct serial_struct __user *retinfo)
{ {
struct serial_struct tmp; struct serial_struct tmp;
struct cyclades_card *cinfo = info->card; struct cyclades_card *cinfo = info->card;
...@@ -3363,7 +3353,7 @@ get_serial_info(struct cyclades_port *info, ...@@ -3363,7 +3353,7 @@ get_serial_info(struct cyclades_port *info,
static int static int
set_serial_info(struct cyclades_port *info, set_serial_info(struct cyclades_port *info,
struct serial_struct __user * new_info) struct serial_struct __user *new_info)
{ {
struct serial_struct new_serial; struct serial_struct new_serial;
struct cyclades_port old_info; struct cyclades_port old_info;
...@@ -3417,7 +3407,7 @@ set_serial_info(struct cyclades_port *info, ...@@ -3417,7 +3407,7 @@ set_serial_info(struct cyclades_port *info,
* transmit holding register is empty. This functionality * transmit holding register is empty. This functionality
* allows an RS485 driver to be written in user space. * allows an RS485 driver to be written in user space.
*/ */
static int get_lsr_info(struct cyclades_port *info, unsigned int __user * value) static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
{ {
struct cyclades_card *card; struct cyclades_card *card;
int chip, channel, index; int chip, channel, index;
...@@ -3731,8 +3721,8 @@ static void cy_break(struct tty_struct *tty, int break_state) ...@@ -3731,8 +3721,8 @@ static void cy_break(struct tty_struct *tty, int break_state)
spin_unlock_irqrestore(&card->card_lock, flags); spin_unlock_irqrestore(&card->card_lock, flags);
} /* cy_break */ } /* cy_break */
static int static int get_mon_info(struct cyclades_port *info,
get_mon_info(struct cyclades_port *info, struct cyclades_monitor __user * mon) struct cyclades_monitor __user *mon)
{ {
if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor))) if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))
...@@ -3771,8 +3761,8 @@ static int set_threshold(struct cyclades_port *info, unsigned long value) ...@@ -3771,8 +3761,8 @@ static int set_threshold(struct cyclades_port *info, unsigned long value)
return 0; return 0;
} /* set_threshold */ } /* set_threshold */
static int static int get_threshold(struct cyclades_port *info,
get_threshold(struct cyclades_port *info, unsigned long __user * value) unsigned long __user *value)
{ {
struct cyclades_card *card; struct cyclades_card *card;
void __iomem *base_addr; void __iomem *base_addr;
...@@ -3793,15 +3783,15 @@ get_threshold(struct cyclades_port *info, unsigned long __user * value) ...@@ -3793,15 +3783,15 @@ get_threshold(struct cyclades_port *info, unsigned long __user * value)
return 0; return 0;
} /* get_threshold */ } /* get_threshold */
static int static int set_default_threshold(struct cyclades_port *info,
set_default_threshold(struct cyclades_port *info, unsigned long value) unsigned long value)
{ {
info->default_threshold = value & 0x0f; info->default_threshold = value & 0x0f;
return 0; return 0;
} /* set_default_threshold */ } /* set_default_threshold */
static int static int get_default_threshold(struct cyclades_port *info,
get_default_threshold(struct cyclades_port *info, unsigned long __user * value) unsigned long __user *value)
{ {
return put_user(info->default_threshold, value); return put_user(info->default_threshold, value);
} /* get_default_threshold */ } /* get_default_threshold */
...@@ -3828,7 +3818,8 @@ static int set_timeout(struct cyclades_port *info, unsigned long value) ...@@ -3828,7 +3818,8 @@ static int set_timeout(struct cyclades_port *info, unsigned long value)
return 0; return 0;
} /* set_timeout */ } /* set_timeout */
static int get_timeout(struct cyclades_port *info, unsigned long __user * value) static int get_timeout(struct cyclades_port *info,
unsigned long __user *value)
{ {
struct cyclades_card *card; struct cyclades_card *card;
void __iomem *base_addr; void __iomem *base_addr;
...@@ -3855,8 +3846,8 @@ static int set_default_timeout(struct cyclades_port *info, unsigned long value) ...@@ -3855,8 +3846,8 @@ static int set_default_timeout(struct cyclades_port *info, unsigned long value)
return 0; return 0;
} /* set_default_timeout */ } /* set_default_timeout */
static int static int get_default_timeout(struct cyclades_port *info,
get_default_timeout(struct cyclades_port *info, unsigned long __user * value) unsigned long __user *value)
{ {
return put_user(info->default_timeout, value); return put_user(info->default_timeout, value);
} /* get_default_timeout */ } /* get_default_timeout */
...@@ -3941,7 +3932,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file, ...@@ -3941,7 +3932,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
break; break;
#endif /* CONFIG_CYZ_INTR */ #endif /* CONFIG_CYZ_INTR */
case CYSETWAIT: case CYSETWAIT:
info->closing_wait = (unsigned short)arg *HZ / 100; info->closing_wait = (unsigned short)arg * HZ / 100;
ret_val = 0; ret_val = 0;
break; break;
case CYGETWAIT: case CYGETWAIT:
...@@ -4118,9 +4109,8 @@ static void cy_throttle(struct tty_struct *tty) ...@@ -4118,9 +4109,8 @@ static void cy_throttle(struct tty_struct *tty)
tty->ldisc.chars_in_buffer(tty), info->line); tty->ldisc.chars_in_buffer(tty), info->line);
#endif #endif
if (serial_paranoia_check(info, tty->name, "cy_throttle")) { if (serial_paranoia_check(info, tty->name, "cy_throttle"))
return; return;
}
card = info->card; card = info->card;
...@@ -4174,12 +4164,11 @@ static void cy_unthrottle(struct tty_struct *tty) ...@@ -4174,12 +4164,11 @@ static void cy_unthrottle(struct tty_struct *tty)
char buf[64]; char buf[64];
printk(KERN_DEBUG "cyc:unthrottle %s: %ld...ttyC%d\n", printk(KERN_DEBUG "cyc:unthrottle %s: %ld...ttyC%d\n",
tty_name(tty, buf), tty->ldisc.chars_in_buffer(tty),info->line); tty_name(tty, buf), tty_chars_in_buffer(tty), info->line);
#endif #endif
if (serial_paranoia_check(info, tty->name, "cy_unthrottle")) { if (serial_paranoia_check(info, tty->name, "cy_unthrottle"))
return; return;
}
if (I_IXOFF(tty)) { if (I_IXOFF(tty)) {
if (info->x_char) if (info->x_char)
...@@ -4274,7 +4263,8 @@ static void cy_start(struct tty_struct *tty) ...@@ -4274,7 +4263,8 @@ static void cy_start(struct tty_struct *tty)
base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index); base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
spin_lock_irqsave(&cinfo->card_lock, flags); spin_lock_irqsave(&cinfo->card_lock, flags);
cy_writeb(base_addr + (CyCAR << index), (u_char) (channel & 0x0003)); /* index channel */ cy_writeb(base_addr + (CyCAR << index),
(u_char) (channel & 0x0003)); /* index channel */
cy_writeb(base_addr + (CySRER << index), cy_writeb(base_addr + (CySRER << index),
readb(base_addr + (CySRER << index)) | CyTxRdy); readb(base_addr + (CySRER << index)) | CyTxRdy);
spin_unlock_irqrestore(&cinfo->card_lock, flags); spin_unlock_irqrestore(&cinfo->card_lock, flags);
...@@ -4411,10 +4401,11 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo) ...@@ -4411,10 +4401,11 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
info->cor3 = 0x08; /* _very_ small rcv threshold */ info->cor3 = 0x08; /* _very_ small rcv threshold */
chip_number = (port - cinfo->first_line) / 4; chip_number = (port - cinfo->first_line) / 4;
if ((info->chip_rev = readb(cinfo->base_addr + info->chip_rev = readb(cinfo->base_addr +
(cy_chip_offset[chip_number] << (cy_chip_offset[chip_number] << index) +
index) + (CyGFRCR << index))) >= (CyGFRCR << index));
CD1400_REV_J) {
if (info->chip_rev >= CD1400_REV_J) {
/* It is a CD1400 rev. J or later */ /* It is a CD1400 rev. J or later */
info->tbpr = baud_bpr_60[13]; /* Tx BPR */ info->tbpr = baud_bpr_60[13]; /* Tx BPR */
info->tco = baud_co_60[13]; /* Tx CO */ info->tco = baud_co_60[13]; /* Tx CO */
...@@ -4459,7 +4450,8 @@ static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr, ...@@ -4459,7 +4450,8 @@ static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,
/* Cy_ClrIntr is 0x1800 */ /* Cy_ClrIntr is 0x1800 */
udelay(500L); udelay(500L);
for (chip_number = 0; chip_number < CyMAX_CHIPS_PER_CARD; chip_number++) { for (chip_number = 0; chip_number < CyMAX_CHIPS_PER_CARD;
chip_number++) {
base_addr = base_addr =
true_base_addr + (cy_chip_offset[chip_number] << index); true_base_addr + (cy_chip_offset[chip_number] << index);
mdelay(1); mdelay(1);
...@@ -4560,9 +4552,8 @@ static int __init cy_detect_isa(void) ...@@ -4560,9 +4552,8 @@ static int __init cy_detect_isa(void)
/* scan the address table probing for Cyclom-Y/ISA boards */ /* scan the address table probing for Cyclom-Y/ISA boards */
for (i = 0; i < NR_ISA_ADDRS; i++) { for (i = 0; i < NR_ISA_ADDRS; i++) {
unsigned int isa_address = cy_isa_addresses[i]; unsigned int isa_address = cy_isa_addresses[i];
if (isa_address == 0x0000) { if (isa_address == 0x0000)
return nboard; return nboard;
}
/* probe for CD1400... */ /* probe for CD1400... */
cy_isa_address = ioremap(isa_address, CyISA_Ywin); cy_isa_address = ioremap(isa_address, CyISA_Ywin);
...@@ -4852,12 +4843,10 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, ...@@ -4852,12 +4843,10 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
if (mailbox != 0) { if (mailbox != 0) {
/* set window to last 512K of RAM */ /* set window to last 512K of RAM */
cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE); cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE);
//sleep(1);
for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++) for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++)
cy_writeb(tmp, 255); cy_writeb(tmp, 255);
/* set window to beginning of RAM */ /* set window to beginning of RAM */
cy_writel(&ctl_addr->loc_addr_base, WIN_RAM); cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
//sleep(1);
} }
retval = __cyz_load_fw(fw, "Cyclom-Z", mailbox, base_addr, NULL); retval = __cyz_load_fw(fw, "Cyclom-Z", mailbox, base_addr, NULL);
...@@ -5387,7 +5376,8 @@ static void __exit cy_cleanup_module(void) ...@@ -5387,7 +5376,8 @@ static void __exit cy_cleanup_module(void)
del_timer_sync(&cyz_timerlist); del_timer_sync(&cyz_timerlist);
#endif /* CONFIG_CYZ_INTR */ #endif /* CONFIG_CYZ_INTR */
if ((e1 = tty_unregister_driver(cy_serial_driver))) e1 = tty_unregister_driver(cy_serial_driver);
if (e1)
printk(KERN_ERR "failed to unregister Cyclades serial " printk(KERN_ERR "failed to unregister Cyclades serial "
"driver(%d)\n", e1); "driver(%d)\n", e1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7